merge 3.4
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 10:25:40 +0000 (12:25 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 10:25:40 +0000 (12:25 +0200)

Trivial merge