Parse 0.25 as 15min etc, fixes #116 (osx)
Merge branch 'master' into builds
7.475