Merge to my git fork

Sorry if someone get's messages for this, just want to merge the origin master down to my fork.