Rebase SVN trunk 1750