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

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