Merge branch 'for-chris' of git://github.com/idryomov/btrfs-progs