Merge branch 'master' into stm-flash