fix bug with mixing history from different projects
Merge remote-tracking branch 'origin/master'