Merge branch 'master' into next

* master:
  1.4.6 Release

doc/UPDATES

@@ -12,7 +12,7 @@ next
 master
   * Require C++11 compiler support (G++ 4.7+, clang32+)
 
-maint
+1.4.6
   * Disable demo TCL support by default to prevent confusion during build.
   * Avoid apparmor ptrace(2) warnings on Ubuntu
   * Allow 'set trace ignore' again. Undoes a change from 2005.