Merge in some commit changes from github master.