SVN-Revision: 35621
Thank you Rafał Miłecki and Nathan Hintz SVN-Revision: 35574
This fixes #12927. SVN-Revision: 35507