Merge remote-tracking branch 'gravitystorm/flex4' into flex4