Merge remote-tracking branch 'github/pr/2' master
authorAlexander Shorin <kxepal@apache.org>
Thu, 17 Mar 2016 09:25:23 +0000 (12:25 +0300)
committerAlexander Shorin <kxepal@apache.org>
Thu, 17 Mar 2016 09:25:23 +0000 (12:25 +0300)

Trivial merge