Merge branch 'master' into uploadArea