upstream 2014-11-19