Last commit of the night merging gh with master