This commit was SVN r18715.
This commit was SVN r17891.
Remains to be tested to ensure everything came over cleanly, so please continue to withhold commits a little longer This commit was SVN r17632.