tern: don't order_by ? because mysql is awful
Merge remote-tracking branch 'origin/dev' into dev