Merge branch 'wip/configurable-mime-type-gicon'