Synchronise with official 0.9.6.13