Merge branch '2288-smoke-test'
authorBrett Smith <brett@curoverse.com>
Tue, 25 Mar 2014 20:11:48 +0000 (16:11 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 25 Mar 2014 20:11:48 +0000 (16:11 -0400)

Trivial merge