Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Iframe preview properly maximized, fixes #347
Merge pull request #356 from automata/master

Iframe preview properly maximized, fixes #347