Reference schema file.
Merge remote-tracking branch 'github/2.1-dev' into 2.1-dev