Merge branch 'master' into origin-3381-job-progress-bar-bug
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 6 Oct 2014 16:58:19 +0000 (12:58 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 6 Oct 2014 16:58:19 +0000 (12:58 -0400)

Trivial merge