Get rid of some more unneeded boilerplate
Merge remote-tracking branch 'upstream/master'