Merge accumulated patches from Trunk.

Refs , Refs , refs , refs , refs , refs , refs , refs ,
refs , refs , refs , refs , refs , refs .


[SVN r85987]
This commit is contained in:
John Maddock 2013-09-28 16:19:47 +00:00
parent 023118cb86
commit 726983f42e

@ -1 +1 @@
Subproject commit d017041323dedac91b64abcb3e4a207be4f629df
Subproject commit feebe4ee3b13e0f7695d4e92d79a3105a52909aa