MD Keyboard changes
Merge branch 'master' into key-reuse

Conflicts:
	Keyboard/KeyboardLayout.swift