jsdoc update
Merging 2.0.x branch