Updating BEF with master, again! 

Updating BEF with master.

Asanadas decided to merge in some sound changes towards master. They need to be mirrored to BEF, so here we go. :/