Merge latest stuff from composer