Trying to exorcise the .pidb file
Merge branch 'jump'