[krotscheck]

Ehn, it's no biggie. Tagir did most of the code (and owns the commits), I'm just a hominid rebase bot.