Merge branch 'master' into 4951-request-vm
authorRadhika Chippada <radhika@curoverse.com>
Fri, 6 Feb 2015 12:36:15 +0000 (07:36 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Fri, 6 Feb 2015 12:36:15 +0000 (07:36 -0500)

Trivial merge