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

<p>PS: travis is running this PR ;)</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/geany/geany-plugins/pull/394#issuecomment-194467518">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ0wHZ0s7psyL68aKJxFXX4FMmUtHks5prx-kgaJpZM4HrHCO.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany-plugins/pull/394#issuecomment-194467518"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>