upstream Nov 15 2013