Merge branch 'develop'
My GitHub Settings
Possible fix