Merge pull request #1305 from tamird/remove-option. r=emilio

TemplateParameters do not return Option