Patch by jurgemaister, plus some little fixes, fixes #3884. Tested on OSX 10.11. This was SVN commit r18726.