Merge branch 'master' into master_juno

Change-Id: I1cabb6e87fb01c97aab2df38b574aaa988464877
Signed-off-by: Carsten Hiesserich <carsten.hie@gmail.com>