Incubaid/arakoon — pull request #317 by NicolasT (2014-01-22 13:33:06+00:00)
Title: 1.6 for 1.7

Include #315 (#313) in 1.7.