typo fixes
Merge branch 'master' into dev
Pageactivator bug fix
Merge branch 'dev'