Fix for Chrome extension where not all settings where initialized correctly
Merge branch 'refs/heads/development'