Merge branch 'master' into juicypixels
juicypixels: delete
juicypixels: Rebuild build
Merge branch 'juicypixels'