Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	core/bus.py
Merge branch 'master' of ssh://github.com/soomsoom/halva

Conflicts:
	core/bus.py