Merge branch 'master' of github.com:mantisbt-plugins/EmailReporting into Experimental_EmailReplyParser