Allow iframes
Merge branch 'develop'