merge
Merge branch 'master' of https://github.com/Tchaokko/babel
Line edit changed