Updated with work from ACO's
Merge origin/master

Conflicts:
	src/DB/Mapper.php