Removed future imports for releases branch.
Merge branch 'fix_807_for_releases' into resolve_807_merge_conflict
Added future imports lost in merge.