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/core/geometry_type.hpp

@@ -80,10 +80,4 @@ struct PointDimension {
 	int height;
 };
 
-/** A pair of two integers */
-struct Pair {
-	int a;
-	int b;
-};
-
 #endif /* GEOMETRY_TYPE_HPP */