Merge branch 'maint/7.0'master
authorRobin Sonefors <[email protected]>
Wed, 9 Jul 2014 12:00:13 +0000 (9 14:00 +0200)
committerRobin Sonefors <[email protected]>
Wed, 9 Jul 2014 12:00:13 +0000 (9 14:00 +0200)

Trivial merge