Merge upstream/3.7-wip
Merge branch '3.7-wip' of https://github.com/siesqo/forkcms into 3.7-wip