Comment 3 for bug 1301955

Pushed to master, though with with some reluctance as a it would have been better to have solved the underlying problem. There are never enough tuits, of course, but I hope that we can all focus on fixing bug 1187993 for 2.7.0, if not sooner.

Thanks, Ben!