Merge tag 'upstream/3.015'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 8 Sep 2016 09:31:42 +0000 (11:31 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 8 Sep 2016 09:31:42 +0000 (11:31 +0200)
Upstream version 3.015


Trivial merge