Merge origin/master

Conflicts:
	src/core/Auria.php