Add setting for whether to display action messages
Merge branch 'ollieh-master'