bug 938061 - final  - r=zac