Save state before 1.36 merges.

[SVN r47337]