A new feature
Merge branch 'feature-idea'
A master change