added a comment to a test
Merge branch '2.3.x'