Incubaid/arakoon — pull request #226 by domsj (2013-10-23 08:11:47+00:00)
Title: 1.6 backport

There was 1 failing test on CI, but that's another issue (which I will look into on a separate branch).