Fixed an hours bug where location overrides were not working
Merge branch 'master' into test