Обновление 2014-07-13
Typhoon fix
Merge conflict resolve