Merge branch 'pr/25'
authorBrett Smith <brett@curoverse.com>
Mon, 26 Oct 2015 18:46:57 +0000 (14:46 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 26 Oct 2015 18:46:57 +0000 (14:46 -0400)
Closes #7307.


Trivial merge