Merge remote-tracking branch 'gravitystorm/redo' into staging