Merge branch 'master' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 17:52:43 +0000 (13:52 -0400)
committerradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 17:52:43 +0000 (13:52 -0400)

Trivial merge