Merge branch 'master' into 7162-support-service-types
authorradhika <radhika@curoverse.com>
Fri, 25 Sep 2015 12:29:59 +0000 (08:29 -0400)
committerradhika <radhika@curoverse.com>
Fri, 25 Sep 2015 12:29:59 +0000 (08:29 -0400)

Trivial merge