Fix powerline.
Merge branch 'master' into leo-work