There have been push force on master branch, and 1.0.309 seems to be the
result of merging an old version of master branch, the commits between
1.0.308 and 1.0.309 are same as commit on master branch but with
different hashes and when we try to merge master in 1.0 there are
conflicts.

This commit resets to the same state as 1.0.308, it was done with:

  git resore --source 1.0.308 :/
  git commit -a

so it revert all these commits so that we can merge master again.