Merged revision 36658 #7165993ff0 from /trunk.
Merged revisions 36662 #d0ced34a84,36663 #531e504b64,36664 #2edd428275,36665 #8b3461e57f,36666 #844e616738,36667 #99414d6b02 from /trunk
Merged revisions 36649 #1d4a65f793,36657 #e4263b836a,36602 #1016328ac2,36669 #182e5c648f,36670 #d4b74806ba,36671 #221788591b,36672 #07da74130a,36675 #d9ca0b833d,36677 #29adb9ffcc,36679 #bdef003197,36680 #2ec91c5b8e,36681 #846e04db20,36682 #f8a61521aa,36683 #feca15e2d6,36699 #31a6eef00a,36701 #1cd72b5d37,36708 #8ab70b4eca,36709 #4cd477be7c,36728 #5ed7c19f7d from /trunk
Merged revisions 36686 #99f6e25f3f,36688 #5f42b19ce0 from /trunk
Merged revisions 36694 #250300ddd2,36695 #b976510e44 from /trunk
Merged revision 36697 #8814a4f697 from /trunk
Merged revision 36696 #cf85a988a4 from /trunk
Merged revision 36702 #b3d9e6e4a0 from /trunk