c9247f1069
Fixes bug #1012242. Patch stolen from John Tran <jhtran@att.com> Change-Id: Iab59eb752199e0cd3c8134a29e05b53356a30d75