Merge branch 'master' into 6942-improve-compute-node-setup-script
authorWard Vandewege <ward@curoverse.com>
Fri, 21 Aug 2015 14:08:58 +0000 (10:08 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 21 Aug 2015 14:08:58 +0000 (10:08 -0400)

Trivial merge