Merge pull request #3287 from jix/smt2-conditional-store