Merge branch 'stable' of https://github.com/OpencachingDeutschland/oc-server3 into stable
Merge branch 'stable'