Fixing bug introduced by taskchanges commit.
Merge branch 'master' into version1