Updates from other projects

Signed-off-by: Erik Rainey <erik.rainey@ti.com>
Merge branch 'master' of github.com:emrainey/Concerto