Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in

src/rev.cpp.in

@@ -91,4 +91,4 @@ const byte _openttd_revision_tagged = ${REV_ISTAG};
  * version, thus making comparisons on specific revisions easy.
  */
 /** ${REV_ISSTABLETAG} removed */
-const uint32 _openttd_newgrf_version = 1 << 28 | 12 << 24 | 0 << 20 | 0 << 19 | 28004;
+const uint32 _openttd_newgrf_version = ${REV_MAJOR} << 28 | ${REV_MINOR} << 24 | ${REV_BUILD} << 20 | 0 << 19 | 28004;