Merge branch 'master' into dev

Source commit: d71f3f434e7f7b8deac344537cfb16f792091768

libs/neon/src/config.h

@@ -25,7 +25,7 @@
 
 #ifdef WIN32
 
-#define NEON_VERSION "0.31.1"
+#define NEON_VERSION "0.31.2"
 #define NE_VERSION_MAJOR (0)
 #define NE_VERSION_MINOR (31)