Pulling out other branch commits and recommitting from master.