Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Tue, 6 Oct 2015 17:56:12 +0000 (13:56 -0400)
committerradhika <radhika@curoverse.com>
Tue, 6 Oct 2015 17:56:12 +0000 (13:56 -0400)

Trivial merge