Merge pull request #2894 from splitbrain/composerupdates