Merge pull request #4698 from D-Albers/btrfs-progs-4.12