Exit on clear
Merge branch 'master' into linux