[[ Bugfix 11402 ]] Attempt to update thirdparty submodule reference correctly.
[[ Bugfix 11402 ]] Tweaks to get things to compile on OSX.