Merge branches 'master' and 'local' into local
Lots of changes getting mentions to work.
Merge branches 'local' and 'master'