Merge pull request #1255 from samm-git/master