Comment 7 for bug 307592

@Andy Whitcroft, here is well formated signed off patch. I have added the last 2 keys.
I have tested your builds, it works good.