NO COLLISIONS so far in RCIS
git-annex automatic sync
Merge remote-tracking branch 'refs/remotes/origin/master'