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

404