Imported Upstream version 0.12
Merge tag 'upstream/0.12'

Upstream version 0.12
updated changelog for 0.12-1