hmm.. looks like a merge issue. The js-docs branch should not touch any of the core code.