For CMSSW_5_3_14
LocalWJD
Merge branch 'master' into CMSSW_5_3_14