Enable arbitrary bleu/ter weighting
Merge remote-tracking branch 'origin/master'