Bug 936031 - Test case for bug. r=abr
Bug 936031 - Attempted fix. r=ehugg