Merge branch 'master' into v2.1

diff --cc doc/install.html
index b5df697b6709cf6869cbde799b60df3878bb6d1f,5dc1289e2879c3516d4dfed702ea55255d102990..68f49d184d5ab6cba8704bcb9bedefd5f0f568e5
--- 1/doc/install.html
--- 2/doc/install.html
+++ b/doc/install.html
@@@ -121,10 -119,10 +121,10 @@@ operating systems, CPUs and compilers
  </tr>
  <tr class="even">
  <td class="compatcpu">x64 (64 bit)</td>
- <td class="compatos">GCC 4.x</td>
+ <td class="compatos">GCC 4.x+</td>
  <td class="compatos">ORBIS (<a href="#ps4">PS4</a>)</td>
- <td class="compatos">GCC 4.x</td>
+ <td class="compatos">XCode 5.0+<br>Clang</td>
 -<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0</td>
 +<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0<br>Durango (<a href="#xboxone">Xbox One</a>)</td>
  </tr>
  <tr class="odd">
  <td class="compatcpu"><a href="#cross2">ARMv5+<br>ARM9E+</a></td>
@@@ -134,18 -132,18 +134,18 @@@
  <td class="compatos compatno">&nbsp;</td>
  </tr>
  <tr class="even">
 -<td class="compatcpu"><a href="#cross2">PPC</a></td>
 -<td class="compatos">GCC 4.3+</td>
 -<td class="compatos">GCC 4.3+<br>GCC 4.1 (<a href="#ps3">PS3</a>)</td>
 +<td class="compatcpu"><a href="#cross2">ARM64</a></td>
 +<td class="compatos">GCC 4.8+</td>
 +<td class="compatos compatno">&nbsp;</td>
- <td class="compatos">Clang 3.5+</td>
++<td class="compatos">XCode 6.0+<br>Clang 3.5+</td>
  <td class="compatos compatno">&nbsp;</td>
 -<td class="compatos">XEDK (<a href="#xbox360">Xbox 360</a>)</td>
  </tr>
  <tr class="odd">
 -<td class="compatcpu"><a href="#cross2">PPC/e500v2</a></td>
 -<td class="compatos">GCC 4.3+</td>
 +<td class="compatcpu"><a href="#cross2">PPC</a></td>
  <td class="compatos">GCC 4.3+</td>
 +<td class="compatos">GCC 4.3+<br>GCC 4.1 (<a href="#ps3">PS3</a>)</td>
  <td class="compatos compatno">&nbsp;</td>
 -<td class="compatos compatno">&nbsp;</td>
 +<td class="compatos">XEDK (<a href="#xbox360">Xbox 360</a>)</td>
  </tr>
  <tr class="even">
  <td class="compatcpu"><a href="#cross2">MIPS</a></td>

diff --cc src/Makefile
Simple merge