Version 1.0.4.0 update

Also includes 1.0.3.5 and 1.0.3.6 which don't seem to have been
committed to GitHub.