Fix missing semi-colons.
Merge branch 'master' into gsa