Merge branch 'redmine-issues/12012' of git.neogeo.fr:geocontrib/geocontrib-frontend into redmine-issues/12012