Bug fix for certain situations with multiple shared libraries using RCC++.
Merge remote-tracking branch 'github/master' into KytheraSpecific