upstream/2.6.10

Mathias Behrle

@mbehrle

b82fb854 · Adding upstream version 2.6.10. · Mar 26, 2014

Tagging upstream version 2.6.10.