Merge pull request #12551 from seamuslee001/missed_54_commits
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Jul 2018 11:34:13 +0000 (23:34 +1200)
committerGitHub <noreply@github.com>
Tue, 24 Jul 2018 11:34:13 +0000 (23:34 +1200)
Included missed 5.3 commits


Trivial merge