Merge remote-tracking branch 'origin/master'

Change-Id: I84233088ff7c7dce9f18d469a086e65a28e9e37f
Signed-off-by: Marcel Simader <marcel0simader@gmail.com>