Fix Xcode "unrecognized selector" warning
Merge branch 'fix-xcode-unrecog-selector-warning'