Merge branch 'release-1.2.5'
Added support for strings like 6pm and 6a.
Version bumped from 1.2.5 to 1.2.6
Merge branch 'release-1.2.6'