merge from git-annex
prep release