Merge tag '20141118083552' into develop

milestone: 20141118083552 20141118083552
ce
Merge branch 'release/20141119065608'