Merge pull request #3703 from BKNio:fixing_bad_alloc
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 18 Feb 2015 13:50:14 +0000 (13:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 18 Feb 2015 13:50:14 +0000 (13:50 +0000)

Trivial merge