Merge with upstream version 1.6.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	openpyxl/__init__.py
	openpyxl/worksheet.py