<p>I rebased it on master, fixed the merge conflicts and tweaked the commit message a bit.</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/pull/677#issuecomment-146376191">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ7jQLLoRYcnmGv8aKn9SXLlA-vfTks5o5a4AgaJpZM4GJRAD.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/pull/677#issuecomment-146376191"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>