Merge branch '1.3.x'

Conflicts:
	NEWS

diff --cc NEWS
index 74b9a6c0ac30b6cebf1423778f9a814c378648f1,695c91c7ee293a879dbe97a6cae1c597dd445b06..d30c0ab778ce680988e1e7f67dde2c8f5239637f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -12,8 -11,12 +12,14 @@@ Changes since 1.
    version of CVC4.  However, the new configure option "--bsd" disables
    these GPL dependences and builds the best-performing BSD-licenced version
    of CVC4.
 +* Small API adjustments to Datatypes to even out the API and make it
 +  function better in Java.
+ * Better automatic handling of output language setting when using CVC4
+   via API.  Previously, the "automatic" language setting was sometimes
+   (though not always) defaulting to the internal "AST" language; it
+   should now (correctly) default to the same as the input language
+   (if the input language is supported as an output language), or the
+   "CVC4" native output language if no input language setting is applied.
  
  Changes since 1.2
  =================

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