Merge fails

[mentiflectax]

Merge of #2 fails due to reasons I don't understand.

Full log: http:https://www.rultor.com/t/1723-71196385

Please make sure that the issue above can be merged.

[yegor256]

@dmarkov assign me to this, I'll fix

[dmarkov]

we'll find someone to do this task, soon

[dmarkov]

@dpisarenko many thanks, 15 mins added to your acc for reporting this bug, pmt ID 50663267

[dmarkov]

@dmarkov assign me to this, I'll fix

@yegor256 the task is yours, please proceed

[yegor256]

@dpisarenko I believe it's fixed already, please check and close

[dmarkov]

@yegor256 30 mins sent to your balance (ID 000-349201b0), many thanks!. +30 added to your rating, current score is: +5483