0001-merge-upstream-1.0.2.patch
