FromHours
Merge branch 'FromHours' into master40
Merge branch 'master40'