Merge branch 'release/20140119-1610'
Merge tag '20140119-1610' into develop

it is a fix only