Merge branch 'master' into cts-playground
Conflicts: cts/CM_ais.py cts/CM_lha.py cts/CTS.py cts/CTSlab.py cts/CTSscenarios.py cts/CTStests.py