Initial commit of versions 3.0.4, 3.1.1 and 3.1.1a