Merge branch 'master' into 420
Issue #420 Removed import statement that was orphaned after merging.