Missing ;'s
Merge branch 'master' into core