add commits from opengm/master