Updated confluence links to 3.1, unified, where straightforward
Merge remote-tracking branch 'origin/master' into 3.1/vaclavFixes
Rebuilt