tree 8b98edc245b2463b375a1cf89a0c07f3a72e7c24
parent 850768db80688571cfabb7507209671bbd007f5c
parent deaba768b1042e08c0c0a732f3202ffe106ea038
author Marco Miller <marco.miller@ericsson.com> 1594651225 -0400
committer Marco Miller <marco.miller@ericsson.com> 1594651225 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix plugin builds on OSX

Change-Id: I142a8ec12dcdf348830f64cf1928afbcb75979e0