Pull request to fix merge inconsistencies

Pull request to fix merge inconsistencies between zucchi and martinglover repos