Merge pull request #1270 from fatbob313/master