ready to pull
Merge remote-tracking branch 'origin/master'
query refactored w/o relations
Merge remote-tracking branch 'origin/master'