Fix handling of non-whitelisted method calls.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix handling of non-whitelisted method calls.
Update to latest.