Moved
cleaned
Merge branch 'master' into stable