Fix/nousagi/merge upstream master