3.0.2 - incorporating latest fixes from 2.x