Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration