Prepare for 3.1.0 release
Prepare for 3.1.1 development
Merge remote-tracking branch 'remotes/upstream/master' into patch-4
Fixed missing colors in toolbar (cancel/copy) and some other issues.