Fixed compatibility with spyderlib >= 2.2.0beta3
Merge remote-tracking branch 'origin/develop' into develop