Big commit for shinken 1.4