...
Merge branch 'briaree' of https://github.com/bartvm/mosesdecoder into briaree