Update config version, changelog again
Update build libraries
Merge remote-tracking branch 'upstream/master'