Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Fix installation of plugins

Change-Id: I6742a5cd3417633be2ad8347f8ebea2fdcc07b88