adding fix for pyside on MAC OS
Merge remote-tracking branch 'origin/develop' into develop