Df2014 trunk

attempting to pull in new changes