Merge pull request #980 from cjmayo/ecma_classes