Remove deprecated things
Merge branch 'master' into STABLE