Merge hotfix changes back into develop

There were a few changes that we made to master directly whilst doing the hotfix for IE11.  These need to be merged back into develop.