Updated imports for 1.1
Merge branch 'master' into scala-2.10