Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add the standard LICENSE file

Change-Id: I0205561ce36a31b3c529bb01a1999a8df844bffe