Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix plugin loading under IE 11

Change-Id: If63067708dc1520a79fba6563b190cd5b01fc0bf