Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ie922330679bc438166c89c9d8446827ac1ffd061
Merge topic 'PvxFullScreenBorders' into next

1ae250c Add FullScreen and ShowBorders options to PVX files.
d72cd97 Fix Geometry PVX specification.
Merge topic '13811_fix_3Dwidgets' into next

bc7cf27 BUG #13811 - 3D widget visibility issues.
Merge topic '13799_comparative_view_fixes' into next

87e9016 Fixed Overlay mode in Comparative View.
70f9e29 BUG #13799. Variables not showing curretly for Comparative View.