Merge remote-tracking branch 'origin/stable' into dev

The inline keyword needs to be defined to __inline
for MSVC when compiling C files.

The patch removing the redefinition of inline does not work
with the updated library, instead we resurrect the ifdef for
MSVC only.

Conflicts:
	src/3rdparty/libtiff/libtiff/tif_config.h

Change-Id: I22bbaf3627fdb4f3dc60c9cd0f8d3282efc5bd2c

src/3rdparty/libtiff/libtiff/tif_config.h

@@ -412,9 +412,12 @@
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
+#if defined(Q_CC_MSVC)
 #ifndef __cplusplus
-#undef inline
-#define inline
+# ifndef inline
+#  define inline __inline
+# endif
+#endif
 #endif
 
 /* Define to `long int' if <sys/types.h> does not define. */