Bug 861168: Fix regression in l10n_merge command.
Merge branch 'bug-861168-fix-l10n-merge'