CORE: TP updates for June Version Update
Merge branch 'master' of https://github.com/DarkstarProject/darkstar