* commit '48c95c4370533bf27e537cbca1e64d060a016c5f': Fix build breakage in older branches by avoiding <> notation