Merge branch 'pr/24'
authorBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 21:30:37 +0000 (17:30 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 21:31:04 +0000 (17:31 -0400)
Closes #7262.


Trivial merge