has messages have a data prop
Merge branch 'master' into gh-pages