Use the + operator instead of array_merge to properly handle numeric keys. Fixes #2589
Merge branch 'master' into gh-pages