Still requires a patch to Pology to keep the source file ordering. This was SVN commit r15894.
This was SVN commit r15732.