Merge pull request #1228
Merge pull request #1228 in master