Merge remote-tracking branch 'origin/master' into photon-simrel

Change-Id: Ib7e117d914ecbad5347450849ba0164168ed3390
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>