Merge tag '20141119065608' into develop

milestone: 20141119065608 20141119065608
java7
Merge branch 'release/20141119070415'