I fixed https://bugzilla.mozilla.org/show_bug.cgi?id=939971 yesterday and I'm quite sure this was the same problem.

I'm doing a PR right now for this and I'll ask you feedback and review from steve (because I know your time is limited these days)