Merge remote-tracking branch 'origin/master'

Conflicts:
	application/cache/twig/7c/2e/8cdce896dc236e5ff037b368be8b.php
	application/views/welcome/welcome.html.twig