website: Merge branch 'stable' into develop

Change-Id: Ica3db1495c5523e245b6c4367b84b30651a076a9