OSM-Feature
Merge branch 'nadir_osm' of github.com:moses-smt/mosesdecoder into nadir_osm