Shortened the lines a bit
Text under 120
Merge branch 'l3-changes'