Merge branch 'master' into 3898-job-state-attr
authorradhika <radhika@curoverse.com>
Fri, 19 Sep 2014 12:50:05 +0000 (08:50 -0400)
committerradhika <radhika@curoverse.com>
Fri, 19 Sep 2014 12:50:05 +0000 (08:50 -0400)

Trivial merge