8b931916
f4f2bd21
* commit '8b9319162d4f574fc45f88e6f9e28e62a4b5da78': Tweak for forward compatibility