Trying to install pyside again.
Trying to install pyside again.
Merge branch 'master' into reorganizing