]> git.ipfire.org Git - thirdparty/LuaJIT.git/log
thirdparty/LuaJIT.git
6 days agoFix string.format for limited precision FP conversions. v2.1
Mike Pall [Mon, 8 Dec 2025 21:18:40 +0000 (22:18 +0100)] 
Fix string.format for limited precision FP conversions.

Enforce round-to-even semantics. #1363

9 days agoPPC: Fix soft-float lj_num2u64().
Mike Pall [Sat, 6 Dec 2025 07:44:03 +0000 (08:44 +0100)] 
PPC: Fix soft-float lj_num2u64().

Reported by Doug Crawford. #1411

9 days agoARM64: More fixes for ARM BTI.
Mike Pall [Sat, 6 Dec 2025 07:42:18 +0000 (08:42 +0100)] 
ARM64: More fixes for ARM BTI.

Reported by Yuichiro Naito. #1415

9 days agoDUALNUM: Fix narrowing of unary minus.
Mike Pall [Sat, 6 Dec 2025 07:39:11 +0000 (08:39 +0100)] 
DUALNUM: Fix narrowing of unary minus.

Reported by Sergey Kaplun. #1418

9 days agoMerge branch 'master' into v2.1
Mike Pall [Sat, 6 Dec 2025 07:38:49 +0000 (08:38 +0100)] 
Merge branch 'master' into v2.1

9 days agoDUALNUM: Add missing type conversion for FORI slots. master v2.0
Mike Pall [Sat, 6 Dec 2025 07:35:19 +0000 (08:35 +0100)] 
DUALNUM: Add missing type conversion for FORI slots.

Reported by Sergey Kaplun. #1413

2 weeks agoRemove pointless GCC/MSVC const function attributes.
Mike Pall [Mon, 1 Dec 2025 12:50:32 +0000 (13:50 +0100)] 
Remove pointless GCC/MSVC const function attributes.

They are only called from JIT-compiled code and not from C.
Reported by Richard Beckmann. #1414

2 weeks agoFix MSVC LJ_CONSTF declaration.
Mike Pall [Thu, 27 Nov 2025 19:04:42 +0000 (20:04 +0100)] 
Fix MSVC LJ_CONSTF declaration.

Reading MS docs is hard. #1412

2 weeks agoBack out MSVC LJ_CONSTF declaration.
Mike Pall [Thu, 27 Nov 2025 19:02:00 +0000 (20:02 +0100)] 
Back out MSVC LJ_CONSTF declaration.

The reason for the error message is still unclear. #1412.

2 weeks agoRemove compiler flag for FP conversions. Now unnecessary.
Mike Pall [Thu, 27 Nov 2025 16:48:44 +0000 (17:48 +0100)] 
Remove compiler flag for FP conversions. Now unnecessary.

Undo #1355. #1397 #1411

2 weeks agoUnify Lua number to FFI integer conversions.
Mike Pall [Thu, 27 Nov 2025 16:45:17 +0000 (17:45 +0100)] 
Unify Lua number to FFI integer conversions.

Phew. #1411

2 weeks agoARM64: Fix disassembly of certain sub-word-size loads/stores.
Mike Pall [Thu, 27 Nov 2025 15:39:15 +0000 (16:39 +0100)] 
ARM64: Fix disassembly of certain sub-word-size loads/stores.

4 weeks agoELF/Mach-O: Force default visibility for public API functions.
Mike Pall [Sun, 16 Nov 2025 18:41:51 +0000 (19:41 +0100)] 
ELF/Mach-O: Force default visibility for public API functions.

Thanks to Dymphna. #1409

4 weeks agoMerge branch 'master' into v2.1
Mike Pall [Sun, 16 Nov 2025 18:36:40 +0000 (19:36 +0100)] 
Merge branch 'master' into v2.1

4 weeks agox86/x64: Backport fix for math.min()/math.max() argument check.
Mike Pall [Sun, 16 Nov 2025 18:34:11 +0000 (19:34 +0100)] 
x86/x64: Backport fix for math.min()/math.max() argument check.

Reported by puffy.

4 weeks agoMerge branch 'master' into v2.1
Mike Pall [Fri, 14 Nov 2025 19:22:24 +0000 (20:22 +0100)] 
Merge branch 'master' into v2.1

4 weeks agoFix edge cases when generating IR for string.byte/sub/find.
Mike Pall [Fri, 14 Nov 2025 19:15:44 +0000 (20:15 +0100)] 
Fix edge cases when generating IR for string.byte/sub/find.

Contributed by XmiliaH. #1407

5 weeks agoMerge branch 'master' into v2.1
Mike Pall [Mon, 10 Nov 2025 17:18:19 +0000 (18:18 +0100)] 
Merge branch 'master' into v2.1

5 weeks agoFFI: Avoid dangling cts->L.
Mike Pall [Mon, 10 Nov 2025 17:15:11 +0000 (18:15 +0100)] 
FFI: Avoid dangling cts->L.

Reported by ZumiKua. #1405

5 weeks agoRun VM events and finalizers in separate state.
Mike Pall [Mon, 10 Nov 2025 17:11:26 +0000 (18:11 +0100)] 
Run VM events and finalizers in separate state.

Reported by Sergey Kaplun. #1403

5 weeks agomacOS: Change Mach-O object file layout required by XCode 15.0.
Mike Pall [Sat, 8 Nov 2025 15:54:00 +0000 (16:54 +0100)] 
macOS: Change Mach-O object file layout required by XCode 15.0.

Reported by George Zhao. #1404

5 weeks agoARM64: Enable unaligned accesses if indicated by the toolchain.
Mike Pall [Sat, 8 Nov 2025 14:41:42 +0000 (15:41 +0100)] 
ARM64: Enable unaligned accesses if indicated by the toolchain.

If you get a crash in jit_init() then you need to fix your toolchain.

5 weeks agoAllow mcode allocations outside of the jump range to the support code.
Mike Pall [Wed, 5 Nov 2025 23:42:02 +0000 (00:42 +0100)] 
Allow mcode allocations outside of the jump range to the support code.

Thank you for your patience. #285

5 weeks agoARM64: Fix disassembly of >2GB branch targets.
Mike Pall [Wed, 5 Nov 2025 23:30:22 +0000 (00:30 +0100)] 
ARM64: Fix disassembly of >2GB branch targets.

6 weeks agox64: Fix CET IBT.
Mike Pall [Wed, 29 Oct 2025 08:38:41 +0000 (09:38 +0100)] 
x64: Fix CET IBT.

Reported by Yuichiro Naito. #1400

6 weeks agoARM64: Fix ARM BTI.
Mike Pall [Wed, 29 Oct 2025 08:38:31 +0000 (09:38 +0100)] 
ARM64: Fix ARM BTI.

Reported by Yuichiro Naito. #1400

6 weeks agoWindows: Fix lua52compat option for msvcbuild.bat.
Mike Pall [Tue, 28 Oct 2025 03:59:18 +0000 (04:59 +0100)] 
Windows: Fix lua52compat option for msvcbuild.bat.

Thanks to Alex Orlenko. #1395 #1366

6 weeks agoARM64: Add support for ARM BTI.
Mike Pall [Tue, 28 Oct 2025 03:46:10 +0000 (04:46 +0100)] 
ARM64: Add support for ARM BTI.

Note: this is not enabled by default, look for CET in lj_arch.h.
Thanks to Yuichiro Naito. #1398

6 weeks agox64: Various fixes for CET IBT.
Mike Pall [Mon, 27 Oct 2025 23:27:15 +0000 (00:27 +0100)] 
x64: Various fixes for CET IBT.

Also add ELF notes. #1391

8 weeks agox64: Add support for CET IBT.
Mike Pall [Thu, 16 Oct 2025 12:24:52 +0000 (14:24 +0200)] 
x64: Add support for CET IBT.

Note: this is not enabled by default, look for CET in lj_arch.h
Contributed by Yuichiro Naito. #1391

8 weeks agoGracefully handle broken custom allocator.
Mike Pall [Thu, 16 Oct 2025 11:23:51 +0000 (13:23 +0200)] 
Gracefully handle broken custom allocator.

Reported by Alex Orlenko. #1393

8 weeks agoAdd GNU/Hurd build support.
Mike Pall [Thu, 16 Oct 2025 11:17:45 +0000 (13:17 +0200)] 
Add GNU/Hurd build support.

Note: this is not an officially supported target.
Contributed by Pino Toscano and Samuel Thibault. #1383 #1384

8 weeks agoFix io.write() of newly created buffer.
Mike Pall [Thu, 16 Oct 2025 11:13:51 +0000 (13:13 +0200)] 
Fix io.write() of newly created buffer.

Reported by vfprintf. #1386

8 weeks agoFix reporting of an error during error handling.
Mike Pall [Thu, 16 Oct 2025 11:11:02 +0000 (13:11 +0200)] 
Fix reporting of an error during error handling.

Reported by Sergey Kaplun. #1381

4 months agoWindows: Add lua52compat option to msvcbuild.bat.
Mike Pall [Thu, 24 Jul 2025 13:45:24 +0000 (15:45 +0200)] 
Windows: Add lua52compat option to msvcbuild.bat.

Thanks to Gil Reis. #1366

4 months agoMerge branch 'master' into v2.1
Mike Pall [Thu, 24 Jul 2025 13:41:35 +0000 (15:41 +0200)] 
Merge branch 'master' into v2.1

4 months agox86/x64: Don't use undefined MUL/IMUL zero flag.
Mike Pall [Thu, 24 Jul 2025 13:38:45 +0000 (15:38 +0200)] 
x86/x64: Don't use undefined MUL/IMUL zero flag.

Reported by VrIgHtEr. #1376

4 months agoAvoid out-of-range PC for stack overflow error from snapshot restore.
Mike Pall [Thu, 24 Jul 2025 13:35:56 +0000 (15:35 +0200)] 
Avoid out-of-range PC for stack overflow error from snapshot restore.

Reported by Sergey Kaplun. #1369

4 months agoFFI: Fix dangling CType references (again).
Mike Pall [Thu, 24 Jul 2025 13:29:54 +0000 (15:29 +0200)] 
FFI: Fix dangling CType references (again).

Reported by Sergey Kaplun. Collateral of #1360

6 months agoMerge branch 'master' into v2.1
Mike Pall [Wed, 28 May 2025 19:14:47 +0000 (21:14 +0200)] 
Merge branch 'master' into v2.1

6 months agoFix JIT slot overflow during up-recursion.
Mike Pall [Wed, 28 May 2025 19:13:17 +0000 (21:13 +0200)] 
Fix JIT slot overflow during up-recursion.

Reported by Sergey Kaplun. #1358

6 months agoMerge branch 'master' into v2.1
Mike Pall [Wed, 28 May 2025 19:06:44 +0000 (21:06 +0200)] 
Merge branch 'master' into v2.1

6 months agoAvoid out-of-range PC for stack overflow error from snapshot restore.
Mike Pall [Wed, 28 May 2025 19:02:31 +0000 (21:02 +0200)] 
Avoid out-of-range PC for stack overflow error from snapshot restore.

Reported by Sergey Kaplun. #1359

6 months agoMerge branch 'master' into v2.1
Mike Pall [Wed, 28 May 2025 18:39:05 +0000 (20:39 +0200)] 
Merge branch 'master' into v2.1

6 months agoFFI: Fix dangling CType references.
Mike Pall [Wed, 28 May 2025 18:36:24 +0000 (20:36 +0200)] 
FFI: Fix dangling CType references.

Reported by Sergey Kaplun. Collateral of #1360

8 months agoPrevent Clang UB 'optimization' which breaks integerness checks.
Mike Pall [Thu, 10 Apr 2025 20:53:50 +0000 (22:53 +0200)] 
Prevent Clang UB 'optimization' which breaks integerness checks.

Thanks to Kacper Michajłow. #1351 #1355

8 months agoARM: Fix soft-float math.min()/math.max().
Mike Pall [Thu, 10 Apr 2025 20:45:38 +0000 (22:45 +0200)] 
ARM: Fix soft-float math.min()/math.max().

Reported by Dong Jianqiang. #1356

8 months agoARM64: Fix pass-by-value struct calling conventions.
Mike Pall [Thu, 10 Apr 2025 20:06:47 +0000 (22:06 +0200)] 
ARM64: Fix pass-by-value struct calling conventions.

Reported by AnthonyK213. #1357

8 months agoMerge branch 'master' into v2.1
Mike Pall [Mon, 7 Apr 2025 08:33:15 +0000 (10:33 +0200)] 
Merge branch 'master' into v2.1

8 months agoFix error generation in load*.
Mike Pall [Mon, 7 Apr 2025 08:27:40 +0000 (10:27 +0200)] 
Fix error generation in load*.

Reported by Sergey Kaplun. #1353

8 months agoInitialize unused value when specializing to cdata metatable.
Mike Pall [Mon, 7 Apr 2025 07:22:07 +0000 (09:22 +0200)] 
Initialize unused value when specializing to cdata metatable.

Reported by jakitliang. #1354

9 months agoChange handling of nil value markers in template tables.
Mike Pall [Tue, 11 Mar 2025 22:04:30 +0000 (23:04 +0100)] 
Change handling of nil value markers in template tables.

Reported by Bernhard M. Wiedemann. #1348 #1155
Fixes from Peter Cawley, Christian Clason, Lewis Russell.

9 months agoREVERT: Change handling of nil value markers in template tables.
Mike Pall [Mon, 10 Mar 2025 01:56:07 +0000 (02:56 +0100)] 
REVERT: Change handling of nil value markers in template tables.

9 months agomacOS: Fix Apple hardened runtime support and put behind build option.
Mike Pall [Mon, 10 Mar 2025 01:53:20 +0000 (02:53 +0100)] 
macOS: Fix Apple hardened runtime support and put behind build option.

Reported by vanc. #1334

9 months agomacOS: Fix support for Apple hardened runtime.
Mike Pall [Sun, 9 Mar 2025 23:05:08 +0000 (00:05 +0100)] 
macOS: Fix support for Apple hardened runtime.

Reported by Christian Clason. #1334

9 months agoFix handling of nil value markers in template tables.
Mike Pall [Sun, 9 Mar 2025 22:11:05 +0000 (23:11 +0100)] 
Fix handling of nil value markers in template tables.

Thanks to Peter Cawley. #1348 #1155

9 months agoMerge branch 'master' into v2.1
Mike Pall [Sun, 9 Mar 2025 22:09:02 +0000 (23:09 +0100)] 
Merge branch 'master' into v2.1

9 months agoAvoid unpatching bytecode twice after a trace flush.
Mike Pall [Sun, 9 Mar 2025 22:04:23 +0000 (23:04 +0100)] 
Avoid unpatching bytecode twice after a trace flush.

Reported by Sergey Kaplun. #1345

9 months agoFix state restore when recording __concat metamethod.
Mike Pall [Sun, 9 Mar 2025 20:28:17 +0000 (21:28 +0100)] 
Fix state restore when recording __concat metamethod.

Reported by Sergey Kaplun. #1338 #1298

9 months agoWindows: Allow mixed builds with msvcbuild.bat.
Mike Pall [Sun, 9 Mar 2025 20:05:06 +0000 (21:05 +0100)] 
Windows: Allow mixed builds with msvcbuild.bat.

Suggested by alex4814. #1341

9 months agomacOS: Add suport for Apple hardened runtime.
Mike Pall [Sun, 9 Mar 2025 19:45:22 +0000 (20:45 +0100)] 
macOS: Add suport for Apple hardened runtime.

Thanks to Peter Cawley. #1334

9 months agoMerge branch 'master' into v2.1
Mike Pall [Sun, 9 Mar 2025 15:25:34 +0000 (16:25 +0100)] 
Merge branch 'master' into v2.1

9 months agoAdd compatibility string coercion for fp:seek() argument.
Mike Pall [Sun, 9 Mar 2025 15:21:29 +0000 (16:21 +0100)] 
Add compatibility string coercion for fp:seek() argument.

Reported by Magnus Wibeck. #1343

9 months agoWindows: Clarify installation directory layout.
Mike Pall [Sun, 9 Mar 2025 15:10:22 +0000 (16:10 +0100)] 
Windows: Clarify installation directory layout.

Suggested by eabase. #1346

9 months agoRemove Cygwin from docs, since it's not a supported target.
Mike Pall [Sun, 9 Mar 2025 15:09:36 +0000 (16:09 +0100)] 
Remove Cygwin from docs, since it's not a supported target.

9 months agoImprove CLI signal handling on POSIX.
Mike Pall [Sun, 9 Mar 2025 14:50:01 +0000 (15:50 +0100)] 
Improve CLI signal handling on POSIX.

9 months agoFFI: Add pre-declared int128_t, uint128_t, __int128 types.
Mike Pall [Sun, 9 Mar 2025 14:37:35 +0000 (15:37 +0100)] 
FFI: Add pre-declared int128_t, uint128_t, __int128 types.

Note: Only declaration and copy (interpreted only) are implemented.

9 months agoUse dylib extension for iOS installs, too.
Mike Pall [Sun, 9 Mar 2025 14:00:15 +0000 (15:00 +0100)] 
Use dylib extension for iOS installs, too.

Reported by Andrey Filipenkov. #1336

9 months agoChange handling of nil value markers in template tables.
Mike Pall [Sun, 9 Mar 2025 13:44:57 +0000 (14:44 +0100)] 
Change handling of nil value markers in template tables.

Reported by Bernhard M. Wiedemann. #1348 #1155

11 months agoMerge branch 'master' into v2.1
Mike Pall [Mon, 13 Jan 2025 15:22:22 +0000 (16:22 +0100)] 
Merge branch 'master' into v2.1

11 months agoFix recording of BC_VARG.
Mike Pall [Mon, 13 Jan 2025 15:19:57 +0000 (16:19 +0100)] 
Fix recording of BC_VARG.

Reported by Bachir Bendrissou.

11 months agoReject negative getfenv()/setfenv() levels to prevent compiler warning.
Mike Pall [Mon, 13 Jan 2025 15:16:27 +0000 (16:16 +0100)] 
Reject negative getfenv()/setfenv() levels to prevent compiler warning.

Thanks to Sergey Kaplun. #1329

11 months agoMerge branch 'master' into v2.1
Mike Pall [Mon, 13 Jan 2025 15:15:19 +0000 (16:15 +0100)] 
Merge branch 'master' into v2.1

11 months agoBump copyright date.
Mike Pall [Mon, 13 Jan 2025 14:59:10 +0000 (15:59 +0100)] 
Bump copyright date.

11 months agoMerge branch 'master' into v2.1
Mike Pall [Mon, 16 Dec 2024 13:32:07 +0000 (14:32 +0100)] 
Merge branch 'master' into v2.1

11 months agoForce fallback source name for stripped bytecode.
Mike Pall [Mon, 16 Dec 2024 13:30:10 +0000 (14:30 +0100)] 
Force fallback source name for stripped bytecode.

Reported by Lyrth. #1319

11 months agoRemove dependency on <limits.h>.
Mike Pall [Mon, 16 Dec 2024 13:27:58 +0000 (14:27 +0100)] 
Remove dependency on <limits.h>.

Reported by yupengda002. #1318

12 months agoRestore state when recording __concat metamethod throws OOM.
Mike Pall [Thu, 28 Nov 2024 17:07:58 +0000 (18:07 +0100)] 
Restore state when recording __concat metamethod throws OOM.

Reported by Sergey Kaplun. #1298 #1234

12 months agoMIPS64: Fix pcall() error case.
Mike Pall [Thu, 28 Nov 2024 15:33:18 +0000 (16:33 +0100)] 
MIPS64: Fix pcall() error case.

Thanks to Sergey Kaplun. #1308

12 months agoMerge branch 'master' into v2.1
Mike Pall [Thu, 28 Nov 2024 15:28:51 +0000 (16:28 +0100)] 
Merge branch 'master' into v2.1

12 months agoFix detection of inconsistent renames due to sunk values.
Mike Pall [Thu, 28 Nov 2024 15:26:10 +0000 (16:26 +0100)] 
Fix detection of inconsistent renames due to sunk values.

Thanks to Sergey Kaplun. #1295 #584

13 months agoWindows: Allow amalgamated static builds with msvcbuild.bat.
Mike Pall [Thu, 14 Nov 2024 16:21:00 +0000 (17:21 +0100)] 
Windows: Allow amalgamated static builds with msvcbuild.bat.

Reported by Naman Dixit. #1289

13 months agoAlways close profiler output file.
Mike Pall [Thu, 14 Nov 2024 16:13:58 +0000 (17:13 +0100)] 
Always close profiler output file.

Reported by Guilherme Batalheiro. #1304

13 months agoFix override of INSTALL_LJLIBD in the presence of DESTDIR.
Mike Pall [Thu, 14 Nov 2024 16:09:07 +0000 (17:09 +0100)] 
Fix override of INSTALL_LJLIBD in the presence of DESTDIR.

Reported by faithanalog. #1239 #1303

13 months agoFix bit op coercion for shifts in DUALNUM builds.
Mike Pall [Wed, 13 Nov 2024 08:18:32 +0000 (09:18 +0100)] 
Fix bit op coercion for shifts in DUALNUM builds.

Reported by Junlong Li. Followup to #1273

14 months agomacOS: Remove obsolete -single_module flag.
Mike Pall [Wed, 2 Oct 2024 11:59:42 +0000 (13:59 +0200)] 
macOS: Remove obsolete -single_module flag.

Thanks to dundargoc. #1284

14 months agomacOS: Workaround for buggy XCode 15.0 - 15.2 linker.
Mike Pall [Wed, 2 Oct 2024 10:12:56 +0000 (12:12 +0200)] 
macOS: Workaround for buggy XCode 15.0 - 15.2 linker.

Thanks to Carlo Cabrera. #1283

14 months agomacOS: Fix macOS 15 / Clang 16 build.
Mike Pall [Wed, 2 Oct 2024 00:06:25 +0000 (02:06 +0200)] 
macOS: Fix macOS 15 / Clang 16 build.

Note: The -Wl,-no_deduplicate workaround is NOT needed anymore.
Thanks to fxcoudert, corsix, clason, baconpaul, mvf. #1275 #1266

14 months agoFix bit op coercion in DUALNUM builds.
Mike Pall [Sun, 29 Sep 2024 14:46:29 +0000 (16:46 +0200)] 
Fix bit op coercion in DUALNUM builds.

Thanks to Sergey Kaplun. #1273

14 months agoMerge branch 'master' into v2.1
Mike Pall [Sun, 29 Sep 2024 14:11:15 +0000 (16:11 +0200)] 
Merge branch 'master' into v2.1

14 months agoFix compiliation of getmetatable() for UDTYPE_IO_FILE.
Mike Pall [Sun, 29 Sep 2024 14:03:37 +0000 (16:03 +0200)] 
Fix compiliation of getmetatable() for UDTYPE_IO_FILE.

Reported by Sergey Bronnikov. #1279

14 months agoRemove ancient RtlUnwindEx workaround for MinGW64.
Mike Pall [Sun, 29 Sep 2024 13:33:32 +0000 (15:33 +0200)] 
Remove ancient RtlUnwindEx workaround for MinGW64.

Thanks to Kacper Michajłow. #1272

15 months agoDrop unused function wrapper.
Mike Pall [Wed, 4 Sep 2024 12:32:08 +0000 (14:32 +0200)] 
Drop unused function wrapper.

Follow-up to #1247.

15 months agoMerge branch 'master' into v2.1
Mike Pall [Sat, 24 Aug 2024 15:14:51 +0000 (17:14 +0200)] 
Merge branch 'master' into v2.1

15 months agoFix limit check in narrow_conv_backprop().
Mike Pall [Sat, 24 Aug 2024 15:11:45 +0000 (17:11 +0200)] 
Fix limit check in narrow_conv_backprop().

Thanks to Sergey Kaplun. #1262

15 months agoAlways use IRT_NIL for IR_TBAR.
Mike Pall [Sat, 24 Aug 2024 15:03:17 +0000 (17:03 +0200)] 
Always use IRT_NIL for IR_TBAR.

Thanks to Peter Cawley. #1258

15 months agoARM64: Use ldr literal to load FP constants.
Mike Pall [Wed, 21 Aug 2024 09:31:29 +0000 (11:31 +0200)] 
ARM64: Use ldr literal to load FP constants.

Thanks to Peter Cawley. #1255

15 months agoFFI: Add missing coercion when recording 64-bit bit.*().
Mike Pall [Tue, 20 Aug 2024 17:13:59 +0000 (19:13 +0200)] 
FFI: Add missing coercion when recording 64-bit bit.*().

Thanks to Peter Cawley. #1252

15 months agoARM64: Make tobit conversions match JIT backend behavior.
Mike Pall [Tue, 20 Aug 2024 17:01:51 +0000 (19:01 +0200)] 
ARM64: Make tobit conversions match JIT backend behavior.

Thanks to Peter Cawley. #1253

15 months agoMerge branch 'master' into v2.1
Mike Pall [Tue, 20 Aug 2024 17:01:38 +0000 (19:01 +0200)] 
Merge branch 'master' into v2.1