With contributions from: Thibault Saunier <tsaunier@igalia.com> Matthew Waters <matthew@centricular.com> Fixes #651 Part-of: <!661>