Merge branch '6591-6674-6676-nginx-docs-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 18:04:21 +0000 (14:04 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 18:05:00 +0000 (14:05 -0400)
Closes #6591, #6674, #6676, #6739 (woo!).


Trivial merge