Merge pull request #1108 from AladW/build-chroot-defaults