Merge branch 'master' into 6602-job-runtime-display
authorradhika <radhika@curoverse.com>
Mon, 27 Jul 2015 19:20:10 +0000 (15:20 -0400)
committerradhika <radhika@curoverse.com>
Mon, 27 Jul 2015 19:20:10 +0000 (15:20 -0400)

Trivial merge