BEF merge [waitabit]

List of changes:
http://baystation12.net/forums/viewtopic.php?f=5&t=7536

**DO NOT MERGE** until #2746 is closed for some reason or another.