Restored commits from Oct. 16 to Oct. 31, 2014

The commit on Nov. 8, 2014 had the wrong parent commit.