Merge branch 'master' into 2.1
Comments and Content template cleanup

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Schema

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Merge remote-tracking branch 'origin/2.1'