Imported Upstream version 3.3
Merge tag 'upstream/3.3'

Upstream version 3.3
merge packaging changes from Zang MingJie <zealot0630@gmail.com>