Merge Fakturoid pull-request.