Allowing an uneditable "bettyeditable" (I know, that sounds insane)
Merge branch 'master' into release