Pull requests for 1.0.10

Please carefully test