Updated to use latest git-trunk.