Merge branch 'php-package-separator' into master-rc
Merge branch 'php-fix-sanitize' into master-rc
Reformated model class (type hinting, set, get).