update7 post/comment check was the wrong way around. fixed
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'