rebased against 2.0.0 head
fixed brokem impa certs
use official patch for missing c-return event
eliminate compile time warnings on Mavericks