Merge branch 'master' into 4951-request-vm
authorRadhika Chippada <radhika@curoverse.com>
Thu, 5 Feb 2015 21:22:57 +0000 (16:22 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Thu, 5 Feb 2015 21:22:57 +0000 (16:22 -0500)

Trivial merge