Merge pull request #5388 from alalek:disable_invalid_string_usage
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 3 Nov 2015 10:58:57 +0000 (10:58 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 3 Nov 2015 10:58:57 +0000 (10:58 +0000)

Trivial merge