Merge branch 'master' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Wed, 14 Oct 2015 19:15:15 +0000 (15:15 -0400)
committerradhika <radhika@curoverse.com>
Wed, 14 Oct 2015 19:15:15 +0000 (15:15 -0400)

Trivial merge