Merge with kitkat-mr1

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>