Update patch for astroid
Merge branch 'new_master'

Conflicts:
	astroid_function_annotations.patch