Merge branch 'master' into xcodeproj_dependency

# Conflicts:
#	CHANGELOG.md