Replace iScrubber code for CoffeeScript source and not derived code.
Merge branch 'master' into new-annotations4