Feature #5592: Improve messages
Merge branch 'plugin_fb' of https://github.com/pandamicro/plugin-x into plugin_fb