Fix #1417 (airlocks and emags)
Merge pull request #1434 from wild-billy/airlocks

Fix #1417 (airlocks and emags)