Removed unused imports
Merge branch 'master' into new_master
There were some problems with merging. Trying to create new master with history from old master.