Merge branch 'master' into wip_alan_T5615_gitlive_force_all_roojs_projects