merging  Commit  fe80ef4...  Better handling of group IDs in thread queries.
merging  Commit  fe80ef4...  Better handling of group IDs in thread queries.

edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform