Merge upstream texane/master