Comment 1 for bug 1049658

The commit is prepared and ready to be pushed with an ACK.