Merge tag 'upstream/0.2.5'

Upstream version 0.2.5
Imported Upstream version 0.2.5
New upstream version
Imported Upstream version 0.2.6
Merge tag 'upstream/0.2.6'

Upstream version 0.2.6
Updated changelog for new upstream.