SIGN IN SIGN UP

Bring the extra-src branch up to date with the trunk.

FossilOrigin-Name: 12ff5c5c4162951a29b638a5bc6cffa50e057c5a5e8f5e9c627af5f4ab1e4cdb
S
stephan committed
32888c2b30cefad8b1bfec91b2b7dba2e2b1513a