Switch back and upgrade mainline Marionette as PR has been merged
Switch back and upgrade mainline Marionette as PR has been merged

nusmodifications/nusmods,Yunheng/nusmods,Yunheng/nusmods,mauris/nusmods,chunqi/nusmods,mauris/nusmods,zhouyichen/nusmods,chunqi/nusmods,nathanajah/nusmods,chunqi/nusmods,Yunheng/nusmods,zhouyichen/nusmods,nusmodifications/nusmods,mauris/nusmods,nathanajah/nusmods,mauris/nusmods,nathanajah/nusmods,nusmodifications/nusmods,Yunheng/nusmods,chunqi/nusmods,nathanajah/nusmods,Yunheng/nusmods,nusmodifications/nusmods,zhouyichen/nusmods,zhouyichen/nusmods