Merge security fixes branch
Bumped version after the 3.0.5 release