Merge branch 'sensu' into 'master'

Sensu

See merge request !4