Merge master (@ "delete this clone" is a cap block)