SVN trunk 1715