Aug 14 scrum

Signed-off-by: Adam Litke <agl@linux.vnet.ibm.com>