v189 final release

Signed-off-by: Haydon Ryan <hryan@pivotallabs.com>
Merge remote-tracking branch 'origin/master' into develop