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

milestone: 20141118074609 20141118074609