Merge commit 'c8f73fd0178a875239f50f4d0a6f013a098be219' into kitkat-themes