I put the fix on unstable.  I guess I can copy it to master.  There.  Pull and try again.