Final cloud9 source update from 11/11/14