Changes made up to 25JAN2014
Merge branch '14.01.25'