Merge pull request #7658 from eileenmcnaughton/sync
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 27 Jan 2016 07:05:06 +0000 (20:05 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 27 Jan 2016 07:05:06 +0000 (20:05 +1300)
Further syncs between to align query class in 4.6 & master


Trivial merge