More Coffe Things
Merge branch 'release/3.6.0'
Merge branch 'develop' of https://github.com/cheriuyot/mnh into develop

* 'develop' of https://github.com/cheriuyot/mnh:
  More Coffe Things