Merge branch '2470-doc-refresh'.
authorBrett Smith <brett@curoverse.com>
Wed, 2 Apr 2014 14:05:01 +0000 (10:05 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 2 Apr 2014 14:05:11 +0000 (10:05 -0400)
Closes #2470, #2490.


Trivial merge