Merge from ^/trunk/en [r4211]. (Issue #264).
Authored by: lyalyakin 2016-03-02
Parent: [r5118]
Child: [r5120]