Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/digital_resources/Lekiosk/CasLink.php
#	library/digital_resources/Lekiosk/Link.php
#	library/startup.php
#	tests/application/modules/opac/controllers/ModulesControllerTest.php
#	tests/library/Class/LeKioskLinkTest.php