Merge branch 'master' into 3586-job-priority closes #3586
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Sep 2014 20:56:51 +0000 (16:56 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 9 Sep 2014 13:19:56 +0000 (09:19 -0400)

Trivial merge