Merge branch 'workshop' into python

Conflicts:
Global/GitVersion.h
Gui/KnobGuiTypes.cpp
Gui/ViewerTab.cpp
libs/OpenFX