Bug 845229 - added custom settings support

Conflicts:
	Makefile