Correct fault on Track Properties while tracking is on.
Merge remote-tracking branch 'upstream/master'