Ok -> OK (bug 879407)
Merge pull request #153 from muffinresearch/Ok-2-OK-879407

Ok -> OK (bug 879407)
for when you get a TypeError
allow a user whitelist (bug 879360)