Merge remote-tracking branch 'origin/v1-1-0' into 1.2

# Conflicts:
#	.gitignore
#	tests/__init__.py
#	tests/augmentations/__init__.py
#	tests/augmentations/test_transforms.py