- ensure swizzling always swaps the methods of correct class
Merge branch 'upstream/master'

- ensure swizzling always swap the methods of correct class
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.