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

Trivial merge