mesos master changes
Merge branch 'master' of github.com:cashoefman/chronos