Fixes #1014

Apr 08, 2013
dominic-p added commit #30141e6d3b

Dec 13, 2013
mattyza commits #0d43ffbf13 without addressing merge conflict message.
This merge conflict contained the issue.

Dec 19, 2013
Shelob9 commits #b52bea1974 to remove the merge errors text from the
minified script, fixing the syntactical error, but leaving logical
errors in place.