Upstream version 20150102