Merge remote-tracking branch 'remotes/origin/bugfix/7315_vsi_icons'
Merge remote branch 'origin/feature/7208_event_weights'
Merge branch 'master' of https://github.com/mantidproject/mantid
Merge remote-tracking branch 'origin/bugfix/7081_qtassistant_error_reporting'
refs #7340 Allowed vector types to be seen

in log view of mantiplot
re #7340 Allowed array properties to display as multi row tables
Merge branch 'feature/7340_MD_sample_crash' into develop