update
merging origin/git-annex into git-annex