Merge pull request #952 from ClaymorePT/master