upstream/2.6.5

Mathias Behrle

@mbehrle

8c903e8f · Adding upstream version 2.6.5. · Jun 10, 2013

Tagging upstream version 2.6.5.