Fix: restart of mysql for opensuse
Merge remote-tracking branch 'origin/3.3' into 3.4
Merge remote-tracking branch 'origin/3.4' into develop