Merge branch 'master' into flex4