(temporary) add printouts to queries, to help with tracking which queries are not finishing
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'