Merge branch 'master' into develop

Author: Keith-CY

compatible.json

@@ -261,4 +261,4 @@
       ]
     }
   }
-}
+}