Merged r9895 from trunk.
Merged r9908 from trunk.
Merged r9896 from trunk.
Merged r9894 from trunk.
Merged r9875 from trunk.
Tests should not change settings.
Removed unused helper.
Adds a scope for sorting groups.