change bootstrap
merge
merge master
Merge branch 'master' into beta
Increase memory limit in test for phpunit with coverage
Merge branch 'master' into beta