auto-compile is bad
Merge branch 'master' into ubuntu