Merge branch '1.4.x'

Conflicts:
	test/regress/regress0/arrays/Makefile.am

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

diff --cc test/regress/regress0/Makefile.am
Simple merge

diff --cc test/regress/regress0/arrays/Makefile.am
index 067ecc08fa7a027b524c8a1360ad3242df47668d,c11d68780b9aefc8d03de5c7fc989d981bed47c2..804987da2ec4da1a18bc333c842ebee19ce75460
--- 1/test/regress/regress0/arrays/Makefile.am
--- 2/test/regress/regress0/arrays/Makefile.am
+++ b/test/regress/regress0/arrays/Makefile.am
@@@ -40,16 -40,11 +40,17 @@@ TESTS =    
        swap_t1_np_nf_ai_00005_007.cvc.smt \
        x2.smt \
        x3.smt \
 -      parsing_ringer.cvc
 -
 -EXTRA_DIST = $(TESTS) \
++      parsing_ringer.cvc \
        bug272.smt \
 -      bug272.minimized.smt
 +      bug272.minimized.smt \
 +      constarr.smt2 \
 +      constarr2.smt2 \
 +      constarr3.smt2 \
 +      constarr.cvc \
 +      constarr2.cvc \
 +      constarr3.cvc
 +
 +EXTRA_DIST = $(TESTS)
  
  #if CVC4_BUILD_PROFILE_COMPETITION
  #else