Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Minor display correction
Add manual mail request area selection option (typing or drawing) (#FS1235)
Merge pull request #208 from Ptizef/master

Minor display correction