Bug 1105440 - Store integration branch merge sha and fast-forward from that
Bug 1105440 - merge pull request #24 from KevinGrandon:bug_1105440_calm_down_autolander to KevinGrandon:master