Merge pull request #1814 from michaelw85/master

Oplossing issue #1813