Reverted master to upstream/master
Merge branch 'master' into automatic