Merge branch 'master' into codegen/cdt

Change-Id: I13d23ac8b883edd16c9eb223c3d93237943dad10
Signed-off-by: Ernesto Posse <eposse@gmail.com>