Merge from feature_merge branch. Build TortoiseMerge successfully.
tree9b223f05412923c039188ce82288d8a367e19456
-rw-r--r-- 282 .gitignore
-rw-r--r-- 261 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3557 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
drwxr-xr-x - src