Add the composer folder to the whitelist.
Merge branch 'origin/dev'