3.0.5a, after git fixes