probably this commit will fix merging issues with django_irods
merged with hs_core_bug_fix branch