Merge "Bug 809: Enhancements to the toaster example"