Merge minor fixes from Trunk.

[SVN r85727]
This commit is contained in:
John Maddock 2013-09-17 17:42:00 +00:00
parent f3523d1693
commit 51ef4b3df6

@ -1 +1 @@
Subproject commit b738a55e0d601544d4945955df216dc6864d863f
Subproject commit b36d432ffa97aa3896da97acc2183b6b99df615e