Sergey Litvinov - 2014-09-13

Accepted in 45fa3efc