website: Merge branch 'stable' into develop

Change-Id: I0e3bd23086245c32876050eddda957be906e249a