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