Merge branch 'master' into 5663-doc-rake-secret
authorRadhika Chippada <radhika@curoverse.com>
Tue, 21 Apr 2015 17:48:40 +0000 (13:48 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 21 Apr 2015 17:48:40 +0000 (13:48 -0400)

Trivial merge