Merge branch 'master' into Updates
update core
ignore settings.php
Revert "update core"

This reverts commit a9e3f5ffce7e0bff18cabf8a4bb9b0b64e2bbce0.
update core
Merge branch 'Updates'