Merge branch 'stable-3.1'

* stable-3.1:
  Fix plugin loading under IE 11

Change-Id: Ib3e7562bb806b2441a66bac25363bb858f5a54e4