Start work on SPE modules
Merge branch 'master' into feature/fonts