line endings because of new .gitattributes
Merge jrfnl/wordpress-seo/tree/Fix-settings-issues to release/1.5
Merge remote-tracking branch 'jdevalk/release/1.5' into Fix-settings-issues