Merge branch 'libsatsolver' into next