Duh...
Drunk...
Drunk some more...
Drunk some m0re...
Merge remote-tracking branch 'upstream/master'