Merge commit '1.5' into develop
edit fix, undo time field
Bumped version number to 1.5.1
Merge branch 'release/1.5.1'