Merge branch 'master' into v2.1

diff --cc doc/ext_ffi_semantics.html
index 3444b8fbc0e14965607193d197b858b70cf7493b,ce6313d72810caa9bdc70b143974363c7d5fefda..5415787d4ed350584042da6e4774af300276656c
--- 1/doc/ext_ffi_semantics.html
--- 2/doc/ext_ffi_semantics.html
+++ b/doc/ext_ffi_semantics.html
@@@ -1218,9 -1198,11 +1218,9 @@@ suboptimal performance, especially whe
  <li>Vector operations.</li>
  <li>Table initializers.</li>
  <li>Initialization of nested <tt>struct</tt>/<tt>union</tt> types.</li>
 -<li>Allocations of variable-length arrays or structs.</li>
 -<li>Allocations of C&nbsp;types with a size &gt; 128&nbsp;bytes or an
 -alignment &gt; 8&nbsp;bytes.</li>
 -<li>Conversions from lightuserdata to <tt>void&nbsp;*</tt>.</li>
 +<li>Non-default initialization of VLA/VLS or large C&nbsp;types
- (&gt; 128&nbsp;bytes or &gt; 16 array elements.</li>
++(&gt; 128&nbsp;bytes or &gt; 16 array elements).</li>
 +<li>Bitfield initializations.</li>
  <li>Pointer differences for element sizes that are not a power of
  two.</li>
  <li>Calls to C&nbsp;functions with aggregates passed or returned by

diff --cc doc/extensions.html
index cf57e0e8e763ea07d209218e2d951bda5b40c004,0fc65330d413050d861a7d039fdd265e478e51fd..68193187d4aa62b2078296847bf3bf043ed00897
--- 1/doc/extensions.html
--- 2/doc/extensions.html
+++ b/doc/extensions.html
@@@ -397,26 -320,21 +397,26 @@@ the toolchain used to compile LuaJIT
  <td class="excinterop"><b style="color: #00a000;">Full</b></td>
  </tr>
  <tr class="even">
 +<td class="excplatform">ARM <tt>-DLUAJIT_UNWIND_EXTERNAL</tt></td>
 +<td class="exccompiler">GCC, Clang</td>
 +<td class="excinterop"><b style="color: #00a000;">Full</b></td>
 +</tr>
 +<tr class="odd">
  <td class="excplatform">Other platforms, DWARF2 unwinding</td>
 -<td class="exccompiler">GCC</td>
 +<td class="exccompiler">GCC, Clang</td>
  <td class="excinterop"><b style="color: #c06000;">Limited</b></td>
  </tr>
 -<tr class="odd">
 +<tr class="even">
  <td class="excplatform">Windows/x64</td>
- <td class="exccompiler">MSVC or WinSDK</td>
+ <td class="exccompiler">MSVC</td>
  <td class="excinterop"><b style="color: #00a000;">Full</b></td>
  </tr>
 -<tr class="even">
 +<tr class="odd">
  <td class="excplatform">Windows/x86</td>
  <td class="exccompiler">Any</td>
 -<td class="excinterop"><b style="color: #a00000;">No</b></td>
 +<td class="excinterop"><b style="color: #00a000;">Full</b></td>
  </tr>
 -<tr class="odd">
 +<tr class="even">
  <td class="excplatform">Other platforms</td>
  <td class="exccompiler">Other compilers</td>
  <td class="excinterop"><b style="color: #a00000;">No</b></td>

diff --cc doc/faq.html
Simple merge