Merge branch 'release/0.2.5' into develop
Use correct container to resize video
Update changelog
Added mask option to PIL paste to preserve png transparency
Updated changelog for small PIL change
Prep for release
Merge branch 'release/0.2.6'