*AttachOptions -> AttachOptions
Merge branch 'v2' into TemplateOptions

Conflicts:
	options.go
*TemplateOptions -> TemplateOptions