Comment 23 for bug 1382977

Pushed to master, thanks for the patch, testing and review.