Backport 9ba950d8 to release-0.3

@andreasnoack @ivarne I had to manually do this one.  `release-0.3` and `master` are slowly diverging more and more.  Orz