Merge pull request #1380 from totten/master-reapply-1371