Upstream version 2.3.0~git20170108