Merge master in upstream