Merge branch 'hotfix/v2.0.2' into develop
Merge branch 'master' of github.com:ulmic/i_am_the_lider

* 'master' of github.com:ulmic/i_am_the_lider: