Committing little changes in advance with merging upstream master