merge from master (more weird messed up merge business, I don't know what the fuck is going on. thanks git)