Fixes #4001 Deprecate force_ssl_login setting as it's too hard to properly enforce
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/SegmentEditor/API.php
Minor