Merge git://git.jan-o-sch.net/btrfs-unstable into integration