Merge commit 'ba06a404d1437c73ed3ba100d04a217fa69545b8'
Merge commit '6879e5bb1c598a9a517d7bdec8ba1a0bace3ef10' as 'externals/catch'