Fixed a linker issue that had escaped
Merge branch 'master' into release