Upstream changes 2014-06-06