Writing tests for 1.04
Merge tag '1.04' into final
1.04