Onetab

Merged master into onetab in the "wettenhj" organization's instance of the Launcher repository. Now submitting a pull request to include this merge in the monash-merc organization's Launcher repository.