update 3rdparty to match master - just adds the merge commit