last upstream changes 2014-11-19