Comment 16 for bug 1241895

Pushed, thanks!