Merge pull request #4187 from rolfbjarne/dynamic-method-ios