More schema.org data types
auto-merge staging into master