master now contains dev sources; original history preserved.