update from opengm:master