Merge branch 'master' into 3686-sharing-repositories
authorRadhika Chippada <radhika@curoverse.com>
Tue, 27 Jan 2015 18:30:42 +0000 (13:30 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 27 Jan 2015 18:30:42 +0000 (13:30 -0500)

Trivial merge