Merge remote branch 'gravitystorm/autocompletekeys'