Merge branch 'bug/support_nicknym_potential_problems' into develop
-rw-r--r-- 379 .gitignore
-rw-r--r-- 53 CHANGELOG
-rw-r--r-- 35834 LICENSE
-rw-r--r-- 133 README.rst
drwxr-xr-x - changes
-rw-r--r-- 1600 setup.py
drwxr-xr-x - src