// fix fatal uninstall module without file on theme switch
Merge remote-tracking branch 'origin/1.6' into 1.6