c274f99ab3
PR: 229807 Submitted by: John Hay <jhay@meraka.org.za> MFC after: 2 weeks
PR: 229807 Submitted by: John Hay <jhay@meraka.org.za> MFC after: 2 weeks