Merge branch 'master' into 6569-smarter-jobs-image
authorWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 03:19:04 +0000 (23:19 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 03:19:04 +0000 (23:19 -0400)

Trivial merge