support library now set to 20.0.0
Merge branch 'upstream/master'