Adding billygoat, unsupported, code.
Merge remote-tracking branch 'upstream/master'