Merge pull request #928 from jojkaart/master