update from opengm:RC-2.3