Upstream version 20140910