Merge pull request #8608 from eileenmcnaughton/missing_fn
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 22 Jun 2016 07:55:34 +0000 (19:55 +1200)
committerGitHub <noreply@github.com>
Wed, 22 Jun 2016 07:55:34 +0000 (19:55 +1200)
Port missing function in 4.6. Also some minor code style syncs.


Trivial merge