Save state before 1.36 merges.

svn path=/branches/pdimov_pre_136/status/; revision=47337