Fix for #1567
Fix merge conflicts
Fix merge conflicts
Merge pull request #1616 from juancarlospaco/fix/preferences_editor

Fix for #1567