Merge branch 'next' into tabbed_options

* next:
  White space changes.
  tree_editor: Add the query set to the returned result set in the INCLUDE_ANCESTORS case.