JSDoc + JSCS tweaks - Part 2
Merge pull request #1500 from Kienz/jsdocFixes

JSDoc + JSCS tweaks - Part 2