Merge branch 'master' into 4186-install-doc-improvements
authorWard Vandewege <ward@curoverse.com>
Thu, 23 Oct 2014 21:31:38 +0000 (17:31 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 23 Oct 2014 21:31:38 +0000 (17:31 -0400)

Trivial merge