Merge branch 'master' into develop
Fix a bug on ``catsup install``
Merge branch 'develop'

* develop:
  Fix a bug on ``catsup install``