website: Merge branch 'stable' into develop

This is done periodically to keep develop up-to-date with improvements
on stable.

Change-Id: Ic2164dc91b14777e46c97fdc89806d75af5784aa