few more changes in time for rev1 demo
schema commit
Merge remote-tracking branch 'upstream/master'