Update build libs
Fix remain time messages
Merge remote-tracking branch 'upstream/master'