Merge branch 'sensu' into 'master'

correct date calculations

See merge request !4