Fix RuntimeError: the PyQt5.QtCore and PyQt4.QtCore modules both wrap the QObject class
Simplify code
Merge remote-tracking branch 'upstream/dev' into fix_runtime_error

Conflicts:
	jedi/evaluate/imports.py
Add a comment and link to issue #483
Merge pull request #483 from ColinDuquesnoy/fix_runtime_error

Fix RuntimeError: the PyQt5.QtCore and PyQt4.QtCore modules both wrap the QObject class