Merge branch 'stable-3.1' of https://git.ispconfig.org/ispconfig/ispconfig3...

Merge branch 'stable-3.1' of https://git.ispconfig.org/ispconfig/ispconfig3 into dovecot-lastlogin-3.1

Conflicts:
	install/sql/incremental/upd_dev_collection.sql