Merge branch 'master' into cleanup-regexp

diff --cc src/util/regexp.h
index 9fb8aea6076f01781c9c27142a0867a62c9fdb9e,e7c8c5806f4ddbff7819cc810a02f3a795393872..f451a8dec21c19e60f6c3ded06a05fa77ee4a61b
--- 1/src/util/regexp.h
--- 2/src/util/regexp.h
+++ b/src/util/regexp.h
@@@ -20,8 -20,11 +20,9 @@@
  #ifndef __CVC4__REGEXP_H
  #define __CVC4__REGEXP_H
  
 -#include <algorithm>
 -#include <cassert>
 +#include <cstddef>
+ #include <functional>
 -#include <set>
 -#include <sstream>
 +#include <ostream>
  #include <string>
  #include <vector>