Back-merge latest from original author.