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