Merge jsdoc ie filtering fixes



<!---
@huboard:{"order":939.0,"milestone_order":965,"custom_state":""}
-->