Automated merge with bundle:/var/folders/9z/l1x9y3bd16x9_70pdp4703jr0000gp/T/SourceTreeTemp.VldMQI

--- a/src/HOL/ROOT	Tue May 02 14:34:06 2017 +0100
+++ b/src/HOL/ROOT	Tue May 02 14:34:17 2017 +0100
@@ -71,7 +71,7 @@
     Approximations
     Circle_Area
 
-session "HOL-Computational_Algebra" in "Computational_Algebra" = "HOL-Library" +
+session "HOL-Computational_Algebra" (timing) in "Computational_Algebra" = "HOL-Library" +
   theories
     Computational_Algebra
     (*conflicting type class instantiations and dependent applications*)
@@ -562,7 +562,7 @@
   theories CompleteLattice
   document_files "root.tex"
 
-session "HOL-ex" in ex = "HOL-Library" +
+session "HOL-ex" (timing) in ex = "HOL-Library" +
   description {*
     Miscellaneous examples for Higher-Order Logic.
   *}

--- a/src/Pure/Admin/build_log.scala	Tue May 02 14:34:06 2017 +0100
+++ b/src/Pure/Admin/build_log.scala	Tue May 02 14:34:17 2017 +0100
@@ -533,7 +533,7 @@
     val Session_Finished2 =
       new Regex("""^Finished (\S+) \((\d+):(\d+):(\d+) elapsed time.*$""")
     val Session_Timing =
-      new Regex("""^Timing (\S+) \((\d) threads, (\d+\.\d+)s elapsed time, (\d+\.\d+)s cpu time, (\d+\.\d+)s GC time.*$""")
+      new Regex("""^Timing (\S+) \((\d+) threads, (\d+\.\d+)s elapsed time, (\d+\.\d+)s cpu time, (\d+\.\d+)s GC time.*$""")
     val Session_Started = new Regex("""^(?:Running|Building) (\S+) \.\.\.$""")
     val Session_Failed = new Regex("""^(\S+) FAILED""")
     val Session_Cancelled = new Regex("""^(\S+) CANCELLED""")