Merge Harvey branch with jsdoc into Eason master