added gemstone-specific changes from Seaside3.0 onto Seaside3.1