[bcache-tools/f20] (2 commits) ...Merge branch 'master' into f20