update from opengm/master