Merge branch 'master' into development

Author: hollasch

index.html

@@ -113,6 +113,7 @@ <h2>Contributors</h2>
       <li>Aras Pranckevičius
       <li>Becker
       <li>Benjamin Summerton
+      <li>Ben Kerl
       <li>Bennett Hardwick
       <li>Berna Kabadayı
       <li>Dan Drummond
@@ -129,7 +130,6 @@ <h2>Contributors</h2>
       <li>Joey Cho
       <li>Lorenzo Mancini
       <li>Lori Whippler Hollasch
-      <li>M-Grimaud
       <li>Marcus Ottosson
       <li>Matthew Heimlich
       <li>Nakata Daisuke