Merge conflict resolution: Applying LGJSSAddon.m from 1.1.2-beta branch.