Merge remote-tracking branch 'stevee/ovpnmain.cgi-fixes' into next