Get rid of some explicit type arguments
Merge remote-tracking branch 'origin/master'