Looks like this is mostly a dupe of bug 487428, for which I'd already landed a fix. Hence the conflicts in the MP.
Looks like this is mostly a dupe of bug 487428, for which I'd already landed a fix. Hence the conflicts in the MP.