Merge branch 'master' into Module-and-Core-Updates
update core and modules
update core and modules
install ckeditor
remove txt file
Merge branch 'Module-and-Core-Updates'