Commit 5.  Found a mistake.
Merge branch 'release/v1.0' into develop