Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Mon, 5 Oct 2015 11:48:47 +0000 (07:48 -0400)
committerradhika <radhika@curoverse.com>
Mon, 5 Oct 2015 11:48:47 +0000 (07:48 -0400)

Trivial merge