This sounds more like an ape...
Merge branch 'master' of https://github.com/stormdragon2976/tintin-alteraeon

Ack, too many people pushing at once.