merge branch 'devel'

mateoconlechuga · mateoconlechuga · commit 16260e8d5107 · 2020-01-19T07:49:31.000-07:00
diff --git a/tools/convbin b/tools/convbin
@@ -1 +1 @@
-Subproject commit cfed9dc374025a4fc29eedddc5be2131c4cb7ef1
+Subproject commit 37d82a31f901fffa965b51573bc1811223eb0614
diff --git a/tools/convimg b/tools/convimg
@@ -1 +1 @@
-Subproject commit 0bd97d1429a4650f790d293400f4b252055990ed
+Subproject commit 148370a520ee4e12f3a7d0249cc9e59b03d78544
