Continued from last commit:

Merges Libtcod 1.5.2+.