Merge pull request #1069 from andrerod/dev

Fix caching bug
Merge remote-tracking branch 'upstream/dev' into website_slot_create