Merge remote-tracking branch 'origin/feature/10256_wiener_smooth_all_workspace'
Merge remote-tracking branch 'origin/bugfix/10798_setup_pv_z_order'
Merge pull request #106 from mantidproject/bugfix/10784_linux_startup_scripts

Re #10784. Removing links and regular files.
Merge branch 'feature/10767_improve_linux_command_link_buttons' of github.com:mantidproject/mantid into feature/10772_OptOut_usage_stats
Merge remote-tracking branch 'origin/feature/10804_evaluatemdfunction_doc_page'
Merge remote-tracking branch 'origin/bugfix/10674_hardmaskOpt'
Merge remote-tracking branch 'origin/feature/10767_improve_linux_command_link_buttons'
Merge pull request #104 from mantidproject/feature/10559_stat_service

New algorithm that sends json document to statistics service
re #10772 add opt out with confirmation to first use dialog
re #10772 try to decrease conflicts
Merge branch 'master' of github.com:mantidproject/mantid into feature/10772_OptOut_usage_stats
re #10772 try to decrease conflicts
re #10772 merge conflict resolution

Merge branch 'feature/10772_OptOut_usage_stats' into develop

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.ui