Improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	zems/haproxy.py
Improvements