Merge changes Ib293173b,I9244baf7 into rvc-dev

* changes:
  Fix for potential NULL de-reference issue in Reverb
  use vector::erase with std::remove_if