! backport fix #1939
! backport fix #1939

emanuele45/Dialogo,Ant59/Elkarte,elkarte/Elkarte,interlab/Elkarte,joshuaadickerson/Elkarte2,interlab/Elkarte,wizardaf/Elkarte,joshuaadickerson/Elkarte2,emanuele45/Dialogo,wizardaf/Elkarte,interlab/Elkarte,Spuds/Elkarte,StealthWombat/How-to-fork-an-Elk,StealthWombat/How-to-fork-an-Elk,StealthWombat/How-to-fork-an-Elk,joshuaadickerson/Elkarte2,joshuaadickerson/Elkarte2,StealthWombat/How-to-fork-an-Elk,elkarte/Elkarte,Ant59/Elkarte,elkarte/Elkarte,nwsw/Elkarte,emanuele45/Dialogo,nwsw/Elkarte,nwsw/Elkarte,wizardaf/Elkarte,Ant59/Elkarte,Spuds/Elkarte,wizardaf/Elkarte,Spuds/Elkarte