Rebase SVN trunk r1776