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