Merge master(1.7.3) into develop
There are merge conflicts that can't be quickly resolved using Github's web editor. Gonna need a new branch for this and test it.
That finding doesn't contradict that master was merged into develop. I.e. develop has advanced beyond master. We just looked at this diff:
and Github says "There isn’t anything to compare. develop is up to date with all commits from master."
Currently not true (master==1.7.3 and develop=>1.7.4).
Diff of master into develop should be empty