Merge branch 'master' into custom

Conflicts:
	makefile
Merge branch 'custom' into production

* custom:

Conflicts:
	makefile