Fix entry.php mandatory fields for constructor.
Fix typo.
Cleaning up other commits.
Merge remote-tracking branch 'origin/master'
Cleaning up other commits.
Merged from master.