Merge branch 'release/3.7.0' root/tags/taxeditor/3.7.0 3.7.0
authorjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:37 +0000 (12:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:37 +0000 (12:06 +0200)

Trivial merge