Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156' * commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156': Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156' * commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156': Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.