m
Merge branch 'master' into polobranch

Conflicts:
	examples/cheatsheet.md.hints
	plugin/editor/editor.py
added kwargs to 'render' method in all HintsRenderer subclasses