schema 2017-05-25

@steve_grimes has joined the channel