Merge branch 'hotfix/jason_is_bad_with_names'

* hotfix/jason_is_bad_with_names:
  Proving Jason is bad with names
Merge branch 'develop' of github.com:victorngkp/git-flow into develop
aabc
Merge branch 'hotfix/jacktest' into develop