Houdini 14 fixes
Houdini 14 fixes
Merge remote-tracking branch 'upstream/master'