Merge 3.4 -> 3.5
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Tue, 29 Sep 2015 15:36:44 +0000 (18:36 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Tue, 29 Sep 2015 15:36:44 +0000 (18:36 +0300)

Trivial merge