Merge branch 'master' into 2761-diagnostic-suite
authorradhika <radhika@curoverse.com>
Wed, 10 Sep 2014 19:36:11 +0000 (15:36 -0400)
committerradhika <radhika@curoverse.com>
Wed, 10 Sep 2014 19:36:11 +0000 (15:36 -0400)

Trivial merge