Merge pull request #1427 from dbuch/master