FIX: Change add_extension to new 3.1 format
Merge branch 'release/3.0.0'