Use newer import syntax.
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	src/Codecs.jl