New more reliable iframe check
Build release 2.1.5
Merge branch 'release/v2.1.5'