Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken * commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9': Use integer for loop counter instead of float New test in FrameworkTest for the VelocityTracker class Preserve '+' in phone numbers imported from SIM.