fix #1432.
Merge branch 'master' of github.com:TracksApp/tracks