Imported Upstream version 1.2.0
Merge tag 'upstream/1.2.0'

Upstream version 1.2.0
Updated build for new packaging.