Merge branch 'master' into 'master'

99-Shared/cabtr/cabtr_te.bob

99-Shared/cabtr/channel_faults.bob

99-Shared/cabtr/channel_mismatch.bob

99-Shared/cabtr/channel_ranges.bob

99-Shared/cabtr/channel_sel_mode.bob

99-Shared/cabtr/channel_sources.bob

99-Shared/cabtr/fill_calib_files.py

99-Shared/cabtr/open_te.py

99-Shared/cabtr/ts2-cabtrs.bob

99-Shared/controllers_overview_operator.bob

99-Shared/cv_h.bob

99-Shared/cv_v.bob

99-Shared/hand_valve.png

99-Shared/images/heater.png

99-Shared/images/heater.svg

99-Shared/images/locator_v03_darkgrey_transparent_down.png

99-Shared/images/locator_v03_darkgrey_transparent_left.png

99-Shared/images/locator_v03_darkgrey_transparent_right.png

99-Shared/images/locator_v03_darkgrey_transparent_up.png

99-Shared/images/module_bg_v11.png