Merge pull request #1561 from hansva/master