Merge branch 'master' into menu
Merge branch 'design' of https://github.com/Dewwi/heisenberg into design