Merge pull request #12574 from neheb/npupnp-gerbera