Merging in upstream's 1-3-stable branch