Merge branch 'refs/heads/develop' into develop2

Conflicts:
	pyqode/python/modes/autoindent.py
Fix example