Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add the standard LICENSE file

Change-Id: I73ead5575703040f543a07b2cb1a6c9a260ca86d