Merge remote-tracking branch 'origin/master'

Change-Id: I5e562b249e8f7ffa6d5296fa39dba4b536a88286
Signed-off-by: panacotta <alejoar@gmail.com>
Merge remote-tracking branch 'origin/master'

Change-Id: I5f1cfaa8516b33d954d399db3f9a8c9747f1e7b0
Signed-off-by: panacotta <alejoar@gmail.com>