Merge branch 'master' into raysmond
show messages. view messages.
Merge branch 'raysmond'