Merge changes from master of upstream