Merge remote-tracking branch 'upstream/2.0' into performance-improvements

Signed-off-by: Arnau Vàzquez Palma <arnauvp@e.email>

# Conflicts:
#	composer.json
#	index.php
#	src/Helpers/Build.php