Merge pull request #1604 from rubenk/sensors-make-variable-static