Merge branch 'release/20140120-1210'
Merge tag '20140120-1210' into develop

content