Merge branch 'master' into release

01821f02 · thomasmars · d9cf2b90 · 337db963 · 01a2a553 · 2d91b3a5
Commit 01821f02 authored 6 years ago by thomasmars
--- a/editor @ 01a2a553
+++ b/editor @ 01a2a553
-Subproject commit 2d91b3a5f991fe59412b674d6ed1279758f6f912
+Subproject commit 01a2a553c62cf4f5c0c26c3ec7f69059e6133f90
--- a/library @ 85b278bd
+++ b/library @ 85b278bd
-Subproject commit 715fa6f80311adf605898fcf2dfed690b6cc8c4e
+Subproject commit 85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2