update
merging gh-Millak/synced/git-annex into git-annex