Merge branch 'release/20141118074204'
Merge tag '20141118074204' into develop

milestone: 20141118074204 20141118074204