Merge branch 'pr/1'
authorBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 19:25:40 +0000 (15:25 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 16 Sep 2015 19:27:49 +0000 (15:27 -0400)
Closes #7261.

1  2 
jenkins/run-tests.sh

Simple merge