Fix 'Undeclared selector' warning
Merge remote-tracking branch 'github/master'