update
Merge remote-tracking branch 'github/master'

Conflicts:
	install/assets/snippets/getExtend.tpl