Last of pahi's commits for 11/20/2013