upstream/2.2.2+repack0

Didier Raboud

@odyx

ec283c91 · Merge upstream 2.2.2 version · Jun 27, 2015

Upstream repacked 2.2.2 version