Fixed a crisis caused by merging a branch which did not pull from the origin for a long time.