Fixed handling of fractional seconds
auto-merge staging into master