Merge commit '04cfab01ba40307ce5421e6dde3598be7eac02bd'
Merge commit '621367dce8abf82e3924679d72f4da0913cc1520' as 'externals/oaknut'