Merge remote-tracking branch 'diyan/master'

Conflicts:
	powerline-shell.py