Merge pull request #1164 from samm-git/master