Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 16:36:16 +0000 (12:36 -0400)
committerradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 16:36:16 +0000 (12:36 -0400)

Trivial merge