Merge branch 'text-parser-improvements' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 16 Aug 2016 04:58:27 +0000 (06:58 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 16 Aug 2016 04:58:27 +0000 (06:58 +0200)

Trivial merge