Merge branch 'master' into i3_auxhours_refac