Use array_replace_recursive
Merge pull request #236 from VitSalis/merge_config_recursive

Use array_replace_recursive
Merge branch 'master' into hover_after_next