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)
commit14d881e3fa59e9a08c5d6dd707adbb5555cc12c2
tree6e2be9917b7c664e9eff449b27270a0725403575
parentfc248030949e41bd29bef87870c5b8dd5866e4a4
parent8643eae984600896eb50daf5c5ff01669c2ebeaf
Merge pull request #7658 from eileenmcnaughton/sync

Further syncs between to align query class in 4.6 & master