Merge up from staging to master

Includes newly optimised images of awesome