Fix query builder ORDER BY syntax (#31)
Merge remote-tracking branch 'upstream/master'
reverting json.org change