Merge branch 'stable-2.15'

* stable-2.15:
  At least get tests compiling properly

Change-Id: Iecbd178c51bdccdab9013a1027422739f164c15e