ref to incorrect function
Merge branch 'master' into dev

* master:
  ref to incorrect function
fixes to timber-term and timber-helper