Fix #3015 - History#stop cleans up iframe.
Merge pull request #3041 from braddunbar/iframe-cleanup

Fix #3015 - History#stop cleans up iframe.