Support R15B
Merge branch 'support-r15b' of git://github.com/fishcakez/ct_helper