Merge remote-tracking branch 'origin/master' into jgrpp

# Conflicts:
#	src/string.cpp

src/fontcache.h

@@ -68,6 +68,12 @@ public:
 	 */
 	inline int GetUnitsPerEM() const { return this->units_per_em; }
 
+	/**
+	 * Get the nominal font size of the font.
+	 * @return The nominal font size.
+	 */
+	virtual int GetFontSize() const { return this->height; }
+
 	/**
 	 * Get the SpriteID mapped to the given key
 	 * @param key The key to get the sprite for.