Merge branch '1539-user-friendly-message' of git.chevah.com:utils into 1539-user-friendly-message

Conflicts:
	chevah/utils/tests/normal/system/test_helpers.py
Merge branch '1539-user-friendly-message' of git.chevah.com:utils into 1539-user-friendly-message