[unity-system-compositor-bzr] Jenkins autocommit: (job: UNFA-4.0-Track-unity-system-compositor-bzr; build no.: 35)
Merge branch 'master' into tracker-mir-bzr
[mir-bzr] Jenkins autocommit: (job: UNFA-4.0-Track-mir; build no.: 235)