Save state before 1.36 merges.

svn path=; revision=47337