Merge branch 'release/20140130-1935'
Merge tag '20140130-1935' into develop

unit items