pull changes from franzoni:master into cms-PdmV:master

Fri Dec 27 09:41:44 SAST 2013
git exercise...

cms-PdmV:master  ...  franzoni:master
pull changes from franzoni:master into cms-PdmV:master