Merged upstream commits since 9/7/14