Merge branch 'messages'
Release 1.0b