* Fixes lockers suffocating you in 5 minutes. Fixes #1227
Merge pull request #1503 from Giacomand/lockersuffocation

Fixes lockers suffocating you in 5 minutes. Fixes #1227