diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 8280b809f6..1dfd7b5b5c 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -641,16 +641,16 @@
         },
         {
             "name": "s9e/text-formatter",
-            "version": "0.6.1",
+            "version": "0.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/TextFormatter.git",
-                "reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420"
+                "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
-                "reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
+                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/99d6b5799387dddfdd00b5a76bb83a15dda586e3",
+                "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3",
                 "shasum": ""
             },
             "require": {
@@ -697,7 +697,7 @@
                 "parser",
                 "shortcodes"
             ],
-            "time": "2016-07-30 01:50:02"
+            "time": "2016-08-09 14:16:45"
         },
         {
             "name": "symfony/config",
diff --git a/tests/text_processing/tickets_data/PHPBB3-14740.html b/tests/text_processing/tickets_data/PHPBB3-14740.html
new file mode 100644
index 0000000000..a1986a0901
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14740.html
@@ -0,0 +1,2 @@
+<div id="modremark"><div id="modremarkexclamation">!</div><div><div id="moderemarktitle">Moderatoropmerking from: neufke</div><div id="moderemarktext">Mod Remark</div></div></div>
+<div id="modremark"><div id="modremarkexclamation">!</div><div><div id="moderemarktitle">Moderatoropmerking from: neufke</div><div id="moderemarktext">Mod Remark</div></div></div>
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14740.txt b/tests/text_processing/tickets_data/PHPBB3-14740.txt
new file mode 100644
index 0000000000..c5b2e74513
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14740.txt
@@ -0,0 +1,2 @@
+[mod=neufke]Mod Remark[/mod]
+[mod="neufke"]Mod Remark[/mod]
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14740.xml b/tests/text_processing/tickets_data/PHPBB3-14740.xml
new file mode 100644
index 0000000000..9e7dc9760c
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14740.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_bbcodes">
+		<column>bbcode_id</column>
+		<column>bbcode_tag</column>
+		<column>bbcode_helpline</column>
+		<column>display_on_posting</column>
+		<column>bbcode_match</column>
+		<column>bbcode_tpl</column>
+		<column>first_pass_match</column>
+		<column>first_pass_replace</column>
+		<column>second_pass_match</column>
+		<column>second_pass_replace</column>
+
+		<row>
+			<value>13</value>
+			<value>mod=</value>
+			<value></value>
+			<value>1</value>
+			<value>[mod=&quot;{TEXT1}&quot;]{TEXT2}[/mod]</value>
+			<value><![CDATA[<div id="modremark">
+	<div id="modremarkexclamation">!</div>
+	<div>
+		<div id="moderemarktitle">Moderatoropmerking {L_FROM}{L_COLON} {TEXT1}</div>
+		<div id="moderemarktext">{TEXT2}</div>
+	</div>
+</div>]]></value>
+			<value>!\[mod\=&quot;(.*?)&quot;\](.*?)\[/mod\]!ies</value>
+			<value>'[mod=&quot;'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${1}')).'&quot;:$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${2}')).'[/mod:$uid]'</value>
+			<value>!\[mod\=&quot;(.*?)&quot;:$uid\](.*?)\[/mod:$uid\]!s</value>
+			<value><![CDATA[<div id="modremark">
+	<div id="modremarkexclamation">!</div>
+	<div>
+		<div id="moderemarktitle">Moderatoropmerking {L_FROM}{L_COLON} ${1}</div>
+		<div id="moderemarktext">${2}</div>
+	</div>
+</div>]]></value>
+		</row>
+	</table>
+</dataset>