#26 Catch up with pyqode.core 2.0 branch