Shinken 2.2 from master branch