upstream/2.6.12

Mathias Behrle

@mbehrle

95c95fee · Adding upstream version 2.6.12. · Jul 02, 2014

Tagging upstream version 2.6.12.