Merge branch 'master' into 7162-support-service-types
authorradhika <radhika@curoverse.com>
Thu, 24 Sep 2015 15:42:58 +0000 (11:42 -0400)
committerradhika <radhika@curoverse.com>
Thu, 24 Sep 2015 15:42:58 +0000 (11:42 -0400)

Trivial merge