Merge pull request #12925 from eileenmcnaughton/setting
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 24 Oct 2018 19:30:12 +0000 (08:30 +1300)
committerGitHub <noreply@github.com>
Wed, 24 Oct 2018 19:30:12 +0000 (08:30 +1300)
Setting conversion


Trivial merge