Refactor last merge to adhere to JSLint rules.

Updated version number.