Let the be stack!
Merge branch 'master' into cond-variables