Work on Model
Merge remote-tracking branch 'origin/4.0' into 4.0

Conflicts:
	Core/Database/Query.php
	Core/Model/Mapper.php