Release 6.5.14
Release 6.5.15
Release 6.5.16
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/Popups/PopupSmarty.php