Merge pull request #3396 from jim-parry/userguide/query_builder

Userguide/query builder