3 0 20 upgrade

@dougfales @bjhess @tjschuck @zmoazeni 

Updates our 3-0-stable to 3.0.20