Merge remote-tracking branch 'origin/layerfix' into mod_all

Conflicts:
	README.md
Updated branch specific readme.