Merge pull request #1363 from nmav/master