Merge branch 'master' into 10979-cancelled-job-nodes
authorradhika <radhika@curoverse.com>
Thu, 16 Feb 2017 21:07:02 +0000 (16:07 -0500)
committerradhika <radhika@curoverse.com>
Thu, 16 Feb 2017 21:07:02 +0000 (16:07 -0500)

Trivial merge