Rebased on master to get the required fixes, and I took the opportunity to squash the 2 GeanyPy-related commits, and fixing a comment.

PS: travis is running this PR ;)

—
Reply to this email directly or view it on GitHub.