upstream/2.3.0+repack0

Didier Raboud

@odyx

8c3bb273 · Merge upstream 2.3.0 version · Jan 13, 2016

Upstream repacked 2.3.0 version