Merge pull request #77 from opengm/master

update from opengm:master
handle arbort due to timeout status correctly
Merge pull request #313 from joergkappes/master

handle arbort due to timeout status correctly