Merge commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40' * commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40': make vpn type strings i18n ready.
Merge commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40' * commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40': make vpn type strings i18n ready.