Merge remote-tracking branch 'origin/master'

diff --cc src/parser/cvc/Cvc.g
Simple merge

diff --cc src/printer/cvc/cvc_printer.cpp
Simple merge

diff --cc src/printer/smt2/smt2_printer.cpp
Simple merge