Merge pull request #2415 from razzfazz/fix_timespec