Merge branch '7645-doc-client-max-body-size-wip'
authorBrett Smith <brett@curoverse.com>
Thu, 12 Nov 2015 21:33:48 +0000 (16:33 -0500)
committerBrett Smith <brett@curoverse.com>
Thu, 12 Nov 2015 21:33:48 +0000 (16:33 -0500)
Closes #7645, #7742.  Refs #7356.


Trivial merge