These changes were pulled from your master, and were in fact part of your fix to the inconsistent stackmap bug.