History and version changes from "master"