fix #660 by checking if options is undefined

- a complete fix with a consistent support of alias in all use cases is not obvious (see #660 for explanations)
updated changelog for PR #666, Closes #660
Merge pull request #17 from grafana/master

Pull in Upstream Changes