Merging in sdo-venkman before publishing.

release notes: http://sdo-venkman.appspot.com/docs/releases.html#sdo-venkman