Fix remaining reference to 'when'
Merge branch 'master' of github.com:mansam/when