Merge branch 'master' into parameters_for_select

Conflicts:
	select.go
	select_test.go