Stockholm editing.
Merge commit 'b0cb7e3dd7885ff0b27ccdedf3fc06aefc150bb6'
Reserved word class is changed to aClass in variable name.