Merge branch 'master' into 3454-default-docker-image
authorRadhika Chippada <radhika@curoverse.com>
Mon, 11 May 2015 15:17:02 +0000 (11:17 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 11 May 2015 15:17:02 +0000 (11:17 -0400)

Trivial merge