Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add the standard LICENSE file

Change-Id: Ib42219d87a29b0db5d6734ce290a2d1c938501a3