Merge branches 'hotkey_conflict_prompt' and 'better_construction_input' into keys
Merge remote-tracking branch 'upstream/master' into keys