Fix master branch to use latest code from DAQ-2014.