Tweak composer (just testing something).
Reverting change.
Merge branch '4.1'