improved fix for moab Time.to_s
Merge branch 'develop'