bem/bem-bl — pull request #564 by tadatuta (2014-10-27 21:15:47+00:00)
Title: Port commits from dev branch

These commits seems safe for me but I'd be happy for review.

// cc @arikon