Merge pull request #1693 from stevewithington/develop

fix for IE/CKFinder