rollup of recent SVN changes