merge
Building patch from version v1.0.2-1-g44e483b
1.0.4