Wrong merge. Fixes #1227
Wrong merge. Fixes #1227

ThibaultR/cgeo,rsudev/c-geo-opensource,marco-dev/c-geo-opensource,brok85/cgeo,ThibaultR/cgeo,Huertix/cgeo,schwabe/cgeo,S-Bartfast/cgeo,tobiasge/cgeo,vishwakulkarni/cgeo,vishwakulkarni/cgeo,kumy/cgeo,lewurm/cgeo,madankb/cgeo,mucek4/cgeo,mucek4/cgeo,matej116/cgeo,rsudev/c-geo-opensource,superspindel/cgeo,kumy/cgeo,schwabe/cgeo,matej116/cgeo,S-Bartfast/cgeo,yummy222/cgeo,tobiasge/cgeo,superspindel/cgeo,Bananeweizen/cgeo,KublaikhanGeek/cgeo,samueltardieu/cgeo,schwabe/cgeo,samueltardieu/cgeo,lewurm/cgeo,marco-dev/c-geo-opensource,cgeo/cgeo,pstorch/cgeo,Bananeweizen/cgeo,SammysHP/cgeo,brok85/cgeo,xiaoyanit/cgeo,Bananeweizen/cgeo,cgeo/cgeo,vishwakulkarni/cgeo,samueltardieu/cgeo,madankb/cgeo,cgeo/cgeo,auricgoldfinger/cgeo,KublaikhanGeek/cgeo,schwabe/cgeo,madankb/cgeo,SammysHP/cgeo,auricgoldfinger/cgeo,tobiasge/cgeo,pstorch/cgeo,KublaikhanGeek/cgeo,rsudev/c-geo-opensource,cgeo/cgeo,S-Bartfast/cgeo,xiaoyanit/cgeo,Huertix/cgeo,ThibaultR/cgeo,mucek4/cgeo,superspindel/cgeo,yummy222/cgeo,matej116/cgeo,auricgoldfinger/cgeo,marco-dev/c-geo-opensource,brok85/cgeo,pstorch/cgeo,lewurm/cgeo,kumy/cgeo,SammysHP/cgeo,yummy222/cgeo,Huertix/cgeo,xiaoyanit/cgeo