Final 1.0.4 build from master.