Merged JSDoc build fixes from master branch