Release code into public domain
Merge upstream