Made a fatpacked WIP version.
Merge branch 'master' into v1.0testing