Merge branch 'master' into codegen/cdt (more changes)

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