Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38