Stop a potential NPE in Gas Gauges.
Merge branch 'development' into 1.8