Merge pull request #1084 from crrodriguez/master
authorDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 06:46:48 +0000 (08:46 +0200)
committerDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 06:46:48 +0000 (08:46 +0200)
misc bugfixes


Trivial merge