Merge branch 'second_branch'

# Conflicts:
#	both-added
#	deleted-by-them
