TSP
Merge git://github.com/swiperrat/cm-black10.1