Merge pull request #12505 from eileenmcnaughton/export_fix_return_order
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 21 Jul 2018 00:34:21 +0000 (12:34 +1200)
committerGitHub <noreply@github.com>
Sat, 21 Jul 2018 00:34:21 +0000 (12:34 +1200)
Extract code for getting additional return properties, test


Trivial merge