We're all Tanuki

Closed Sid Sijbrandij requested to merge tanuki into master