Merge branch 'master' of https://gitlab.eng.unimelb.edu.au/tmiller/swen90006-a1-2019