Merge branch 'develop'
Update Mesos version to 0.16.0