Merge pull request #7322 from alalek:fix_test_crash
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 22 Sep 2016 15:55:19 +0000 (15:55 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 22 Sep 2016 15:55:19 +0000 (15:55 +0000)

Trivial merge