Remove superfluous import
Merge branch '1.2' into 1.3
Fix imports
Merge branch '1.3'
Fix whitespace
Update tests