Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add .apt_generated to .gitignore

Change-Id: Icdd96889f87155974f48d286ef590f26f698266e