Merge tag 'upstream/3.005.001'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Wed, 29 Apr 2015 09:12:06 +0000 (11:12 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Wed, 29 Apr 2015 09:12:06 +0000 (11:12 +0200)
Upstream version 3.005.001


Trivial merge