go 1.4beta1
Merge branch 'upstream' into develop

Conflicts:
	src/pkg/image/jpeg/reader.go
	src/pkg/image/jpeg/scan.go
	src/pkg/image/png/reader.go
	src/pkg/image/png/reader_test.go
	src/pkg/image/png/writer.go