Merge forked master into original master

Should merge without conflict
*fingers crossed*