See attached patch.
Created attachment 17481 [details] Patch v1
Comment on attachment 17481 [details] Patch v1 r=me (that shouldn't be a capital N in Nightly).
Committed r27997 Thanks mitz!