adrien057/TKDetection — pull request #38 by kerautret (2013-04-19 15:14:24+00:00)
Title: cherry pick + merge

Done just merged a conflict but I choose the remote version so it looks ok