Merge "Remove margin from first line of remote history" into pi-dev