Merge pull request #954 from Diapolo/master