Final merge as part of 2014 Summer Internship.