Krystian Kuzniarek 7c2bd3af98 square away the stuff that hasn't been merged in a manual review ... This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.		2019-09-16 19:21:37 +02:00
..
gmock	square away the stuff that hasn't been merged in a manual review	2019-09-16 19:21:37 +02:00