Merge branch 'ale'
Merge remote-tracking branch 'origin/ale'
Merge branch 'master' into ale

e ignored, and an empty message aborts