diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index ffabba65..98da366a 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,13 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 71b4f5b124d14ed609763b11e19d2d480bc32f58
+<pre class='wrap'>commit 9906fbf737692486cebabe98169988d818e2e66a
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2017-07-29 16:22:36 +0200
+
+    Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2k_read_tile_header(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785. Credit to OSS Fuzz
+
+commit 71b4f5b124d14ed609763b11e19d2d480bc32f58
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2017-07-29 15:52:11 +0200
 
@@ -579,26 +585,6 @@ Date:   2017-05-22 23:30:30 +0200
 
     T1: remove unused code in decoder
 
-commit 4068363ff5021608180f712823db55d9c0a551e6
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-05-22 18:42:46 +0200
-
-    T1: fix VSC mode in encoder
-
-commit cd12414c6b11295ae8540df2ef77eb9c624cd264
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-05-20 14:05:07 +0200
-
-    T1: use more compact flags to optimize cache usage in encoder passes. (#172)
-    
-    Ported from Carl Hetherington work (actually through Matthieu Darbois's port
-    on top of OpenJPEG 2.1.0)
-    
-    Can reduce total encoding time by 10-15%
-    
-    WARNING: VSC mode is not implemented, and so is a temporary regression
-    that must be fixed.
-
 commit 53d46fc7330ed652db66aa37b498fbfa27be625c
 Merge: 6e97d87 a8ca7c5
 Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
@@ -764,6 +750,15 @@ Date:   2017-05-03 12:03:00 +0200
 
     Fix retrieval of jpylyzer in AppVeyor
 
+commit a18040e02238c577cf7853a0e303cbca62e044a8
+Merge: e7ff1ef a43f1be
+Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
+Date:   2017-05-03 11:48:02 +0200
+
+    Merge pull request #893 from rouault/remove_tagtree_warnings
+    
+    Remove warnings related to empty tag-trees.
+
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index f9c7c735..7c88a9de 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -473,7 +473,7 @@ $VAR1 = {
                       '2.1' => '2014-04-29 12:58',
                       '2.1.1' => '2016-07-05 14:54',
                       '2.1.2' => '2016-09-28 18:18',
-                      'current' => '2017-07-29 15:52:11'
+                      'current' => '2017-07-29 16:22:36'
                     },
           'HeadersDiff' => {
                              '1.1' => {
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index dfc2c7ba..64a78cab 100644
--- a/abi-check/timeline/openjpeg/index.html
+++ b/abi-check/timeline/openjpeg/index.html
@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2017-07-29<br/>15:52</td>
+<td>2017-07-29<br/>16:22</td>
 <td>N/A</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td>N/A</td>
@@ -152,7 +152,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Jul 29 14:02:15 2017.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Jul 29 14:33:52 2017.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>