Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Add support for newer plugin-node-resolve versions

Change-Id: Ie731df59db447bd619a2151b7ffbd371cff1bf31