Master into bugs

Pretty sure I messed up the branching structure something horrid. :(