This was SVN commit r9936.
This was SVN commit r9384.
Fixes #808. This was SVN commit r9348.
This was SVN commit r9071.