Merge branch 'master' into release

diff --combined .gitignore
index 0571920348a41813cb800889ba77dc9bb80c31c8,0a858681c74ce49237a7086f99462705871bbbf0..b5cd75f474f393bf37a041db6ab2655988ea3bba
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,10 -5,10 +5,10 @@@ Homestead.yam
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /storage/images
@@@ -23,4 -23,5 +23,5 @@@ nbprojec
  .settings/
  webpack-stats.json
  .phpunit.result.cache
- .DS_Store
+ .DS_Store
+ phpstan.neon