Merge tag '20141119070415' into develop

milestone: 20141119070415 20141119070415
mercurial
Merge branch 'release/20141119075009'