Merge pull request #1517 from SimJoSt/master