Merged upstream

Merged upstream + new commits in powerline

Signed-off-by: Bart Kerkvliet <bkerkvliet@gmail.com>