Merge remote-tracking branch 'origin/master'

Author: Codel1417

assets/dynamic_config.json

@@ -11,7 +11,7 @@
     "version": {
       "major": 1,
       "minor": 1,
-      "patch": 1
+      "patch": 5
     }
   }
 }