Fix OS_OBJECT_USE_OBJC handling (fix #329)
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix OS_OBJECT_USE_OBJC handling (fix #329)