Upstream version 20150506