Merge branch 'master' into 6569-smarter-jobs-image
authorWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 20:18:44 +0000 (16:18 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 20:18:44 +0000 (16:18 -0400)

Trivial merge