Merge commit '78bb1d1571ec6adb716ddd080bfbfebc6e889d70'
Merge commit '7eb1d05f63c7ba8df6a203138932ea428ab4aa49' as 'externals/mcl'