Merge pull request #3586 from wangyan42164:bfm
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 12 Jan 2015 10:55:34 +0000 (10:55 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 12 Jan 2015 10:55:34 +0000 (10:55 +0000)

Trivial merge