Apply fix to iframe
Merge remote-tracking branch 'furg/gh-pages' into 2014-05-12-furg