Fix problem with -t, --track command-line flag.
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into python-api