Merge remote-tracking branch 'upstream/develop' into develop
Move configuration from "~/.gitflow_export" to natural git config