Merge no file extension bug fix from upstream