cut diego final release
Merge branch 'master' into develop

Signed-off-by: Sheel Choksi <sheelc@pivotallabs.com>