trim
Merge branch 'maria_HeadDrivenFeature' of github.com:moses-smt/mosesdecoder into maria_HeadDrivenFeature
trim