merging commit from master (https://github.com/thehogfather/pvsio-web/commit/6467ddf9a98bd069360bb77568f01399b5aa181b)