Use closest_content to find some usable content for portal_url
Merge remote-tracking branch 'origin/master'

Conflicts:
	plone/app/textfield/widget.py
Merge remote-tracking branch 'lm/master'
unify bullets