Checking in changes prior to tagging of version 3.0.4.