Merge branch 'master' into 'master'

[packaging] Update config.guess and config.sub, also update spec file configure. Fixes MER#1474

Remade this MR because rebasing didn't work

See merge request !3

Author: faenil