Merge branch 'master' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 03:01:13 +0000 (23:01 -0400)
committerradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 03:01:13 +0000 (23:01 -0400)

Trivial merge