Merge commit 'cb8abc3ae5a1fcd3d7b6ab73472cdf9093302631'
Merge commit '621367dce8abf82e3924679d72f4da0913cc1520' as 'externals/oaknut'