Merge branch 'for-upstream' of https://github.com/andyprice/blktrace