Merge remote branch 'origin/qa' into release
Merge remote branch 'origin/qa' into release
Fixing a bug in base_list_record which was over-querying the database
Merge remote branch 'origin/release' into modules