Merge pull request #11284 from eileenmcnaughton/towards1
authorMathieu Lu <mathieu@bidon.ca>
Sat, 18 Nov 2017 00:33:10 +0000 (19:33 -0500)
committerGitHub <noreply@github.com>
Sat, 18 Nov 2017 00:33:10 +0000 (19:33 -0500)
[NFC] code cleanup: split out 2 functions that are mostly unrelated.


Trivial merge