Merge tag 'upstream/1.2.6'
authorSven Hoexter <sven.hoexter@rewe-digital.com>
Mon, 15 May 2017 15:34:12 +0000 (17:34 +0200)
committerSven Hoexter <sven.hoexter@rewe-digital.com>
Mon, 15 May 2017 15:34:12 +0000 (17:34 +0200)
Upstream version 1.2.6


Trivial merge