Merge pull request #924 from marcusva/master