cms-sw/cmssw — pull request #1908 by ktf (2013-12-20 09:41:20+00:00)
Title: Merge 1897

This should be exactly like 1897, but now mergiable. There seems to be white space issues which are creating troubles.