Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix plugin loading under IE 11

Change-Id: Ide4fcd3778085a9708f453360c50bd8fad198bed