Merge branch 'fixes' into 'master'

Does this sound good to everyone? I'm not sure if stuff will die, but it looks like `fixes` was branched from `master`, so merging back should be A-okay.