aftercommit
eol
Merge branch 'upstream/2.2'

Conflicts:
	lib/class/class.Model.php
Merge pull request #282 from will123195/2.2

afterCommit