Merge branch 'bug_293_indicate_unhandled_key' into experimental