First prototype (:
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/modules/models/commands.pyc