New feature on master.
Merge branch 'feature-idea'
Merge branch 'master' into feature-idea
New feature (in feature-idea branch) for testing conflict.