Merge remote-tracking branch 'remotes/origin/feature7' into develop
Merge branch 'develop' of https://github.com/kaihyu/gitdev into develop