https://trello.com/c/IzuKHfLY/6--
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CMS.php
https://trello.com/c/IzuKHfLY/6--