Recreate 1.0.4 tag.
Stop exception from being consumed during block assembly.
Merge branch 'master' of github.com:jasperblues/Typhoon