Merge commit '5015f388d1cd1db86609e2414b9ea660383f8dbe'

diff --cc .gitignore
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/gdi32/Makefile.in
Simple merge

diff --cc dlls/gdi32/driver.c
Simple merge

diff --cc dlls/gdi32/freetype.c
Simple merge

diff --cc dlls/mountmgr.sys/device.c
Simple merge

diff --cc dlls/mshtml/mshtml_private.h
Simple merge

diff --cc include/config.h.in
Simple merge