Add cool feature
Merge branch 'release-1.0' into develop
Add complex feature
Corrected file
Merge branch 'cool-feature' into develop
Merge branch 'complex-feature' into develop
Merge branch 'release-1.4'