upstream/2.2.6+repack0

Didier Raboud

@odyx

3c1f538a · Merge upstream 2.2.6 version · Dec 16, 2015

Upstream repacked 2.2.6 version