Using the correct base layer (a change that was introduced with the switch to Plone 5)
Merge remote-tracking branch 'origin/master' into plone5

Conflicts:
	src/ploneintranet/workspace/testing.py

Conflicts:
	src/ploneintranet/workspace/testing.py