Merge branch 'bundled-mo' into 'compile-po'