upstream sync 2014-06-21