Bugfix on prev. commit
Merge branch 'master' into british-changes